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)
commit09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
tree1ebcecb7117725fd567de6e9652dc34b5b103f6d
parentd3e6b8a251634ad673242aaa4a298edbb2e8ee39
parent3a34412caae002accd0fc7a7fc0b718c2f34159b
Merge upstream version 25.2