Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 14 Mar 2018 15:38:34 +0000 (11:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 14 Mar 2018 15:38:34 +0000 (11:38 -0400)

Trivial merge