Merge branch 'master' into release

Conflicts:
	bp-xprofile-custom-fields-type.php
	readme.txt

git-svn-id: https://plugins.svn.wordpress.org/buddypress-xprofile-custom-fields-type/trunk@880410 b8457f37-d9ea-0310-8a92-e5e31aec5664