Imported from http://svn.buddypress.org/tags/2.0.3/