Merge remote-tracking branch 'upstream/pull/1687'
authorTom Hughes <tom@compton.nu>
Thu, 23 Nov 2017 13:24:47 +0000 (13:24 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 23 Nov 2017 13:24:47 +0000 (13:24 +0000)

Trivial merge