(cherry picked from commit 179f756866e780411949d817e76801c87e858d30) # Conflicts: # sql/updates/world/2015_12_15_01_world.sql
(cherry picked from commit 179f756866e780411949d817e76801c87e858d30) # Conflicts: # sql/updates/world/2015_12_15_01_world.sql