[merge] swgemu unstable branch 21DEC14