Some cleanup for 2.0.M6 and 1.9.2-RC1 release.