Manual sync with BuddyPress trunk changes to make next merge easier