[merge] swgemu unstable branch 30AUG14  (stability fixes)