Merge from default.
authorDavid Given <dg@cowlark.com>
Fri, 20 Jan 2017 20:29:58 +0000 (21:29 +0100)
committerDavid Given <dg@cowlark.com>
Fri, 20 Jan 2017 20:29:58 +0000 (21:29 +0100)

Trivial merge