Merge remote-tracking branch 'origin/master' into git-svn

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