Update changes in preparation for new release.
Added tag 0.021 for changeset 8677c21a7e35