Merge bbPress 2.5 branch.



git-svn-id: https://plugins.svn.wordpress.org/bbpress/branches/2.5@809974 b8457f37-d9ea-0310-8a92-e5e31aec5664