More bug fixes to CSGModeller from Marco Brenco
Authored by: peastman 2014-12-22
Parent: [r399]
Child: [r401]