Merge bbPress dev trunk.