Rebase to r5296 git://bbpress.git.wordpress.org/