Rollback from commit aafc89
Merge branch 'master' of https://github.com/DBMods/forum-extender-plus