Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 3 Jan 2018 12:47:25 +0000 (07:47 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 3 Jan 2018 12:47:25 +0000 (07:47 -0500)

Trivial merge