Merge remote-tracking branch 'upstream/pull/1575'
authorTom Hughes <tom@compton.nu>
Thu, 6 Jul 2017 18:15:55 +0000 (19:15 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 6 Jul 2017 18:15:55 +0000 (19:15 +0100)

Trivial merge