[merge] SWGEmu unstable 13AUG14