Merge remote-tracking branch 'github/pull/122'
authorTom Hughes <tom@compton.nu>
Wed, 10 May 2017 07:27:11 +0000 (08:27 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 10 May 2017 07:27:11 +0000 (08:27 +0100)

Trivial merge