Final changes to 3.9 branch

git-svn-id: https://plugins.svn.wordpress.org/register-plus-redux/branches/3.9@1003352 b8457f37-d9ea-0310-8a92-e5e31aec5664