locked netcarver/textile to 3.5.x
Merge branch 'master' into 1.0