Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 3 Apr 2018 12:10:17 +0000 (08:10 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 3 Apr 2018 12:10:17 +0000 (08:10 -0400)

Trivial merge