Merge changes from Github

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