Merge from trunk.
authorDavid Given <dg@cowlark.com>
Mon, 12 Dec 2016 22:58:24 +0000 (23:58 +0100)
committerDavid Given <dg@cowlark.com>
Mon, 12 Dec 2016 22:58:24 +0000 (23:58 +0100)
commit9b525d741e703c0103c5b10c3c8c8df8314aec95
treed91df6feeca2d3ed0f28a4bb847dbdb4bfb7ec20
parent1b95b75805e679de58142ca8af755e0459a67f94
parentbf2e0be69a03955a841c576864486e17867bc634
Merge from trunk.