- some parts of this patch are now applied to the main code and removed here.
- some parts of this patch are now applied to the main code and removed here.

marmolejo/bochs-zet,marmolejo/bochs-zet,marmolejo/bochs-zet,marmolejo/bochs-zet,marmolejo/bochs-zet