Merge branch '1.8.x' into svn

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