Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 23 May 2017 12:27:54 +0000 (08:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 23 May 2017 12:27:54 +0000 (08:27 -0400)

Trivial merge