Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 11 Apr 2017 21:13:29 +0000 (17:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 11 Apr 2017 21:13:29 +0000 (17:13 -0400)

Trivial merge