closes #15047 (cherry picked from commit 09b11e219520b5263dd76ef44b954afa1653155b) Conflicts: sql/updates/world/2015_07_24_07_world.sql
closes #15047 (cherry picked from commit 09b11e219520b5263dd76ef44b954afa1653155b) Conflicts: sql/updates/world/2015_07_24_07_world.sql