Merge remote-tracking branch 'upstream/pull/1614'
authorTom Hughes <tom@compton.nu>
Wed, 30 Aug 2017 20:09:32 +0000 (21:09 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 30 Aug 2017 20:09:32 +0000 (21:09 +0100)

Trivial merge