My bug fix branch

All against 4.0.2-rc2.

This could make a 4.0.3.