Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 29 Jan 2016 21:05:49 +0000 (16:05 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 29 Jan 2016 21:05:49 +0000 (16:05 -0500)

Trivial merge