Merge remote-tracking branch 'upstream/pull/2232'
authorTom Hughes <tom@compton.nu>
Tue, 28 May 2019 13:36:38 +0000 (14:36 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 28 May 2019 13:36:38 +0000 (14:36 +0100)

Trivial merge