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)
commit511a2cebd6df0f71ec24b5939564fb58726ead84
treeb34446b1390915d5953ecaaea9a0e8f1e83afb23
parent09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
parent07f8f9bc5a51f5aa94eb099f3e15fbe0c20ea1ea
Merge upstream version 26.1