Merge from default.
authorDavid Given <dg@cowlark.com>
Wed, 30 Nov 2016 21:07:29 +0000 (22:07 +0100)
committerDavid Given <dg@cowlark.com>
Wed, 30 Nov 2016 21:07:29 +0000 (22:07 +0100)

Trivial merge