Merging working branch for 1.0.20 release.