Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 5 Aug 2016 18:31:20 +0000 (14:31 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 5 Aug 2016 18:31:20 +0000 (14:31 -0400)

Trivial merge