Merge WordPress/BuddyPress/bbPress trunk.