Merge branch 'hotfix/1.0.1' v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 1 Aug 2016 14:36:10 +0000 (10:36 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 1 Aug 2016 14:36:10 +0000 (10:36 -0400)

Trivial merge