Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Oct 2018 19:07:40 +0000 (15:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Oct 2018 19:07:40 +0000 (15:07 -0400)

Trivial merge