bbPress:

* Merge dev trunk with deploy trunk.



git-svn-id: https://plugins.svn.wordpress.org/bbpress/trunk@809943 b8457f37-d9ea-0310-8a92-e5e31aec5664