Prepare for 4.0.1 release.
Continue bugfixing.