Merge branch `master` into `boost`
Conflicts:
               BattlegroundMgr.h