Merge branch 'eg212'
authortwirlip <twirlip@twirlip.org>
Wed, 31 May 2017 20:07:21 +0000 (13:07 -0700)
committertwirlip <twirlip@twirlip.org>
Wed, 31 May 2017 20:07:21 +0000 (13:07 -0700)

Trivial merge