Merge upstream version 25.2
authorRob Browning <rlb@defaultvalue.org>
Sat, 24 Jun 2017 22:03:59 +0000 (17:03 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sat, 24 Jun 2017 22:03:59 +0000 (17:03 -0500)

Trivial merge