Merge remote-tracking branch 'upstream/pull/1820'
authorTom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 18:57:37 +0000 (19:57 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 18:57:37 +0000 (19:57 +0100)

Trivial merge