refactor + rehighlight only if we are no doing a reload (issue #406)
fix build problem
Merge branch 'master' of github.com:openscad/openscad into issue406
Merge branch 'master' into issue406