Update change log and bump version number.
Merge branch '0.9.20'