Merge in mainline.
authorRussel Winder <russel@winder.org.uk>
Sat, 26 Aug 2017 13:46:54 +0000 (14:46 +0100)
committerRussel Winder <russel@winder.org.uk>
Sat, 26 Aug 2017 13:46:54 +0000 (14:46 +0100)

Trivial merge