By Killyana, closes #5405 (cherry picked from commit 25f6b642e807a9506ef0f2e7ba98376490a0afa0) Conflicts: sql/updates/world/2015_04_18_00_world.sql
By Killyana, closes #5405 (cherry picked from commit 25f6b642e807a9506ef0f2e7ba98376490a0afa0) Conflicts: sql/updates/world/2015_04_18_00_world.sql