Merge remote-tracking branch 'upstream/pull/1815'
authorTom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 20:26:38 +0000 (21:26 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 20:26:38 +0000 (21:26 +0100)

Trivial merge