- merge David's changes from 1.52 back in, leaving Christophe's changes alone
- merge David's changes from 1.52 back in, leaving Christophe's changes alone

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