Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 12 Jul 2017 15:48:00 +0000 (11:48 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 12 Jul 2017 15:48:00 +0000 (11:48 -0400)

Trivial merge