Merge branch 'tkorvola-misc'
authorDavid Griffith <dave@661.org>
Tue, 27 Mar 2018 10:52:31 +0000 (03:52 -0700)
committerDavid Griffith <dave@661.org>
Tue, 27 Mar 2018 10:52:31 +0000 (03:52 -0700)

Trivial merge