Merge branch 'hotfix/1.0.1' v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 17 Nov 2015 18:47:44 +0000 (13:47 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 17 Nov 2015 18:47:44 +0000 (13:47 -0500)

Trivial merge