[merge] swgemu unstable branch 31AUG14 - fixed for theme park convos and a pet deed