Revert "Revert "Merge branch 'feature' of https://github.com/mybb/mybb into feature""

This reverts commit 1c4e7a67f4bcc4df397d82e54d72195fcf4dee0f.