fix for unused vars
Merge branch 'master' into gpunch