Merge branch 'hotfix/1.0.1' v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 4 Oct 2016 15:25:15 +0000 (11:25 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 4 Oct 2016 15:25:15 +0000 (11:25 -0400)

Trivial merge