Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Sep 2017 13:48:24 +0000 (09:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Sep 2017 13:48:24 +0000 (09:48 -0400)

Trivial merge