merged in BuddyPress 1.6.5 default theme component templates