(cherry picked from commit 151dbb30845b24aa16396880095bb404f42a95e7) Conflicts: sql/updates/world/2015_03_24_00_world.sql
hotfixes