Give account a default email address of None
Remove redundant import.
Avoid race condition when associating wiki accounts
Merge branch 'master' into staging
Merge branch 'staging' into stable