(cherry picked from commit 9a2e9ecccc5ed4d300025f3b6d1cffc6af11265d) Conflicts: sql/updates/world/2015_03_25_00_world.sql