(cherry picked from commit 1184e98da1690f1a12e5939d29fec2f03bef4710) Conflicts: sql/updates/world/2015_04_05_07_world.sql
hotfixes