Merge branch 'timtelcik-frotz-issue-44'
authorDavid Griffith <dave@661.org>
Thu, 15 Jun 2017 19:10:24 +0000 (12:10 -0700)
committerDavid Griffith <dave@661.org>
Thu, 15 Jun 2017 19:10:24 +0000 (12:10 -0700)

Trivial merge