Merge branch 'hotfix/1.0.1' v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 26 May 2016 12:55:23 +0000 (08:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 26 May 2016 12:55:23 +0000 (08:55 -0400)

Trivial merge