Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Jun 2017 20:11:14 +0000 (16:11 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Jun 2017 20:11:14 +0000 (16:11 -0400)

Trivial merge