by @Killyana (cherry picked from commit 294383fec09646ecf534b3fa84d685d26d4cd6f9) Conflicts: sql/updates/world/2015_04_11_02_world.sql
by @Killyana (cherry picked from commit 294383fec09646ecf534b3fa84d685d26d4cd6f9) Conflicts: sql/updates/world/2015_04_11_02_world.sql