Merge branch 'cam-py' of https://github.com/andrewjrobinson/FreeCAD_sf_master into cam-py
Merge branch 'cam-py' of https://github.com/andrewjrobinson/FreeCAD_sf_master into cam-py
Merge branch 'cam-py' into GrammarParser
a bit further