BuddyPress: Merge dev trunk (r8260) with deploy trunk.



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