(cherry picked from commit dd34736757cae77581758f4bf0cef7ba48c73e0d) Conflicts: sql/updates/world/2015_04_08_00_world.sql
hotfixes