Merge branch 'hotfix/v1.0.1' vv1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jan 2016 17:55:11 +0000 (12:55 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jan 2016 17:55:11 +0000 (12:55 -0500)

Trivial merge