(cherry picked from commit 1100fe60572b186eee98b6b7cbdccf5a2d67b7e1) # Conflicts: # sql/updates/world/3.3.5/2016_07_05_01_world.sql
(cherry picked from commit 1100fe60572b186eee98b6b7cbdccf5a2d67b7e1) # Conflicts: # sql/updates/world/3.3.5/2016_07_05_01_world.sql