Merge remote-tracking branch 'upstream/pull/1939'
authorTom Hughes <tom@compton.nu>
Thu, 26 Jul 2018 16:38:40 +0000 (17:38 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 26 Jul 2018 16:38:40 +0000 (17:38 +0100)

Trivial merge