updating trunk from github with 4.2.1

git-svn-id: https://plugins.svn.wordpress.org/bp-registration-options/trunk@1022243 b8457f37-d9ea-0310-8a92-e5e31aec5664