Merge in mainline.
authorRussel Winder <russel@winder.org.uk>
Wed, 2 Aug 2017 08:16:59 +0000 (09:16 +0100)
committerRussel Winder <russel@winder.org.uk>
Wed, 2 Aug 2017 08:16:59 +0000 (09:16 +0100)

Trivial merge