Merge pull request #563 from joonas/master

Improved TestElsewhere.test_opt_in_doesnt_have_to_change_username