Close #14781 (cherry picked from commit 6bac7d0120463e71bdd87c966a24bacf053843ae) Conflicts: sql/updates/world/2015_07_25_02_world.sql
Close #14781 (cherry picked from commit 6bac7d0120463e71bdd87c966a24bacf053843ae) Conflicts: sql/updates/world/2015_07_25_02_world.sql