Merge remote-tracking branch 'upstream/pull/1682'
authorTom Hughes <tom@compton.nu>
Thu, 16 Nov 2017 10:17:06 +0000 (10:17 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 16 Nov 2017 10:17:06 +0000 (10:17 +0000)

Trivial merge