Merge from default.
authorDavid Given <dg@cowlark.com>
Fri, 11 Nov 2016 19:17:54 +0000 (20:17 +0100)
committerDavid Given <dg@cowlark.com>
Fri, 11 Nov 2016 19:17:54 +0000 (20:17 +0100)

Trivial merge