Merge upstream version 27.1
authorRob Browning <rlb@defaultvalue.org>
Sun, 16 Aug 2020 17:49:00 +0000 (12:49 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sun, 16 Aug 2020 17:49:00 +0000 (12:49 -0500)

Trivial merge