Bump to TRUNK 4.0.1