[merge] with SWGEMu unstable 03AUG14