Update to mainline.
authorRussel Winder <russel@winder.org.uk>
Tue, 8 Aug 2017 06:21:01 +0000 (07:21 +0100)
committerRussel Winder <russel@winder.org.uk>
Tue, 8 Aug 2017 06:21:01 +0000 (07:21 +0100)

Trivial merge