By @Nyeriah Closes #14471 (cherry picked from commit 61f6328b2bf53862a9ccdde8b89330f0b7b6c932) Conflicts: sql/updates/world/2015_04_06_02_world.sql
By @Nyeriah Closes #14471 (cherry picked from commit 61f6328b2bf53862a9ccdde8b89330f0b7b6c932) Conflicts: sql/updates/world/2015_04_06_02_world.sql