- sync up with 1.2 branch (to 1.17.2.17)
- sync up with 1.2 branch (to 1.17.2.17)

dbrashear/bochs,dbrashear/bochs,dariaphoebe/bochs,dariaphoebe/bochs,dariaphoebe/bochs,dbrashear/bochs,dbrashear/bochs,dbrashear/bochs,dariaphoebe/bochs,dariaphoebe/bochs