Merge branch '1.7.x' into svn

git-svn-id: https://plugins.svn.wordpress.org/buddypress-docs/trunk@889805 b8457f37-d9ea-0310-8a92-e5e31aec5664