Merge remote-tracking branch 'simh/master'
Merge branch 'master' into KDP
Merge branch 'KDP' of http://github.com/tlhackque/simh into KDP