Check user associations for strong equality
Merge branch 'master' of https://github.com/UK-AS-HIVE/waggle
Don't try to save attachment if running under simpletest.
Merge master branch.