Merge mainline.
authorRussel Winder <russel@winder.org.uk>
Sat, 5 Aug 2017 07:11:25 +0000 (08:11 +0100)
committerRussel Winder <russel@winder.org.uk>
Sat, 5 Aug 2017 07:11:25 +0000 (08:11 +0100)

Trivial merge