Merge from trunk.
authorDavid Given <dg@cowlark.com>
Sat, 15 Oct 2016 22:06:14 +0000 (00:06 +0200)
committerDavid Given <dg@cowlark.com>
Sat, 15 Oct 2016 22:06:14 +0000 (00:06 +0200)

Trivial merge