Merge branch 'ban-login-as-admin'

git-svn-id: https://plugins.svn.wordpress.org/sunny/trunk@964873 b8457f37-d9ea-0310-8a92-e5e31aec5664