(cherry picked from commit 229deea4435c7d642dd5ead062bd2e8b65916a57) Conflicts: sql/updates/world/2015_04_05_03_world.sql
hotfixes