Merge remote-tracking branch 'github/pull/69'
authorTom Hughes <tom@compton.nu>
Mon, 3 Oct 2016 17:39:50 +0000 (18:39 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 3 Oct 2016 17:39:50 +0000 (18:39 +0100)

Trivial merge