Merge remote-tracking branch 'github/pr/83'
authorBen Gamari <ben@smart-cactus.org>
Wed, 8 Nov 2017 06:18:44 +0000 (01:18 -0500)
committerBen Gamari <ben@smart-cactus.org>
Wed, 8 Nov 2017 06:18:44 +0000 (01:18 -0500)

Trivial merge