Merge from default.
authorDavid Given <dg@cowlark.com>
Thu, 1 Dec 2016 23:26:10 +0000 (00:26 +0100)
committerDavid Given <dg@cowlark.com>
Thu, 1 Dec 2016 23:26:10 +0000 (00:26 +0100)

Trivial merge