4.0 update

git-svn-id: https://plugins.svn.wordpress.org/bbp-private-groups/trunk@987986 b8457f37-d9ea-0310-8a92-e5e31aec5664