Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 19:12:28 +0000 (15:12 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 19:12:28 +0000 (15:12 -0400)

Trivial merge