(cherry picked from commit ab42772f8e2798dfa104cb9c7a0c44800c1f91b1) Conflicts: sql/updates/world/2015_07_19_01_world.sql