Merge tag 'upstream/1.6.17'
commit2f8ca9e5c289d5d5990f91285935bd96d9027e89
authorAnders Kaseorg <andersk@mit.edu>
Wed, 16 Mar 2016 17:45:18 +0000 (16 13:45 -0400)
committerAnders Kaseorg <andersk@mit.edu>
Wed, 16 Mar 2016 17:45:18 +0000 (16 13:45 -0400)
tree2f94f4e4f215c5b1ebc8781237f0c82ad9ef88cb
parentc9581f1678b6a963b7c714bd9707fb15fb3c54c4
parentf05f8e14597f7b071f670e495931e5e55a006557
Merge tag 'upstream/1.6.17'

Upstream version 1.6.17