bbPress merging minor change