Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Sep 2017 18:18:33 +0000 (14:18 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Sep 2017 18:18:33 +0000 (14:18 -0400)

Trivial merge