[merge] swgemu unstable branch 04AUG14