Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 14 Mar 2018 14:36:03 +0000 (10:36 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 14 Mar 2018 14:36:03 +0000 (10:36 -0400)

Trivial merge