[merge] swgemu unstable branch 17AUG14