Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 16 May 2018 17:41:11 +0000 (13:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 16 May 2018 17:41:11 +0000 (13:41 -0400)

Trivial merge