Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 14:53:41 +0000 (10:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 14:53:41 +0000 (10:53 -0400)

Trivial merge