fix the documentation (merge errors)
Merge branch 'unstable' of github.com:openscad/openscad into unstable