[merge] with SWGEmu unstable branch 24OCT14