v7.2
Merge branch 'master' into allow_@_in_username