Merge remote-tracking branch 'upstream/pull/1668'
authorTom Hughes <tom@compton.nu>
Thu, 9 Nov 2017 09:45:17 +0000 (09:45 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 9 Nov 2017 09:45:17 +0000 (09:45 +0000)

Trivial merge