Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jun 2018 20:50:22 +0000 (16:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jun 2018 20:50:22 +0000 (16:50 -0400)

Trivial merge