Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 15:23:12 +0000 (11:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 15:23:12 +0000 (11:23 -0400)

Trivial merge