Merge remote-tracking branch 'upstream/pull/1727'
authorTom Hughes <tom@compton.nu>
Thu, 1 Feb 2018 22:43:36 +0000 (22:43 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 1 Feb 2018 22:43:36 +0000 (22:43 +0000)

Trivial merge