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)
commitf375f3b8988c559d32566d7709b4190970c650c6
tree20878e20d6085ca1a0910fc401cc0c7275f64bf1
parent36c1fe9676b8a2f8d4d2174a05cb2d3c47806170
parentecb0e776746503141b7a1b970256e380156739d7
Merge in mainline.