Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Jun 2018 19:11:29 +0000 (15:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Jun 2018 19:11:29 +0000 (15:11 -0400)

Trivial merge