Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Jun 2017 12:18:41 +0000 (08:18 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Jun 2017 12:18:41 +0000 (08:18 -0400)

Trivial merge