[merge] SWGemu unstable branch 22AUG14 10:50:46 (test)