Made changes for 1.9.2 and 2.0.M7 releases.