Merge from trunk.
authorDavid Given <dg@cowlark.com>
Sat, 23 Jun 2018 22:08:39 +0000 (00:08 +0200)
committerDavid Given <dg@cowlark.com>
Sat, 23 Jun 2018 22:08:39 +0000 (00:08 +0200)

Trivial merge