Pull in changelog changes for 0.6.22.