Merge BuddyPress trunk.