Merge upstream version 26.1
authorRob Browning <rlb@defaultvalue.org>
Sat, 15 Dec 2018 18:58:02 +0000 (12:58 -0600)
committerRob Browning <rlb@defaultvalue.org>
Sat, 15 Dec 2018 19:02:06 +0000 (13:02 -0600)

Trivial merge