[merge] swgemu unstable branch 24OCT14 (take 2)