By @Killyana Closes #14413 (cherry picked from commit 236e43443c644a9a50cb48ff7300950c928d336c) Conflicts: sql/updates/world/2015_03_21_01_world.sql
By @Killyana Closes #14413 (cherry picked from commit 236e43443c644a9a50cb48ff7300950c928d336c) Conflicts: sql/updates/world/2015_03_21_01_world.sql