Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 20:40:48 +0000 (16:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 20:40:48 +0000 (16:40 -0400)

Trivial merge