fix issue 680
Merge branch 'master' of github.com:openscad/openscad into issue680
Merge branch 'master' into issue680