Merge branch 'github/pr/57'
authorIvan Kohler <ivan@freeside.biz>
Thu, 18 Aug 2016 21:41:05 +0000 (14:41 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 18 Aug 2016 21:41:05 +0000 (14:41 -0700)

Trivial merge