Merge from trunk.
authorDavid Given <dg@cowlark.com>
Wed, 13 Jun 2018 12:47:25 +0000 (21:47 +0900)
committerDavid Given <dg@cowlark.com>
Wed, 13 Jun 2018 12:47:25 +0000 (21:47 +0900)

Trivial merge