Syncing with github

git-svn-id: https://plugins.svn.wordpress.org/wp-collectiveaccess/trunk@951741 b8457f37-d9ea-0310-8a92-e5e31aec5664
Syncing with github

git-svn-id: https://plugins.svn.wordpress.org/wp-collectiveaccess/trunk@951742 b8457f37-d9ea-0310-8a92-e5e31aec5664