Merge development changes for 1.0.6.0 into the master branch read for release.