Release 1.21.0 – update more fix and fix incomplete merge
Update more files, in the process fixing an incomplete merge that I didn't notice until I tried to do release 1.20.0.
Update more files, in the process fixing an incomplete merge that I didn't notice until I tried to do release 1.20.0.