Merge in mainline.
authorRussel Winder <russel@winder.org.uk>
Tue, 15 Aug 2017 07:20:20 +0000 (08:20 +0100)
committerRussel Winder <russel@winder.org.uk>
Tue, 15 Aug 2017 07:20:20 +0000 (08:20 +0100)

Trivial merge