Merge remote-tracking branch 'upstream/pull/1561'
authorTom Hughes <tom@compton.nu>
Thu, 29 Jun 2017 07:58:29 +0000 (08:58 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 29 Jun 2017 07:58:29 +0000 (08:58 +0100)

Trivial merge