bbPress:

* Merge development branch with deploy branch.



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