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)
commit9a64b602e8cea77e7e747178248e2cbc483f85be
treed557e8efa99b0e39421a904d4268336d7fde9335
parent0bf0316ecf04716211b8d2abdc441a5096e3465b
parent9c291f9f8465f827756810ce01ecde2c15f5463b
Merge mainline.