[merge] SWGEmu unstable branch 18AUG14