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

Issue217
Merge branch 'master' into issue116