Merge remote-tracking branch 'upstream/pull/1604'
authorTom Hughes <tom@compton.nu>
Wed, 2 Aug 2017 14:38:21 +0000 (15:38 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 2 Aug 2017 14:38:21 +0000 (15:38 +0100)

Trivial merge