merged in BuddyPress 1.7 default theme component templates