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)

Trivial merge