Merge branch 'master' into issue217
Merge pull request #326 from openscad/issue217

Issue217
sync
Merge branch 'master' into issue116
Merge pull request #328 from openscad/issue116

Issue116
Merge branch 'master' into local-scope