Merge.
authorDavid Given <dg@cowlark.com>
Thu, 10 Nov 2016 21:06:08 +0000 (22:06 +0100)
committerDavid Given <dg@cowlark.com>
Thu, 10 Nov 2016 21:06:08 +0000 (22:06 +0100)

Trivial merge