By Killyana, closes #9343 (cherry picked from commit f1f3e4988e7d835191c29316327f79b44e7255d3) Conflicts: sql/updates/world/2015_03_23_01_world.sql
By Killyana, closes #9343 (cherry picked from commit f1f3e4988e7d835191c29316327f79b44e7255d3) Conflicts: sql/updates/world/2015_03_23_01_world.sql