Merge mainline.
authorRussel Winder <russel@winder.org.uk>
Fri, 28 Jul 2017 06:12:29 +0000 (07:12 +0100)
committerRussel Winder <russel@winder.org.uk>
Fri, 28 Jul 2017 06:12:29 +0000 (07:12 +0100)

Trivial merge