diff --git a/.gitignore b/.gitignore
index ffb6469fba..b9d9c6efbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,5 +30,6 @@ install_manifest.txt
 /src/Tools/offlinedoc/localwiki/
 /src/Tools/offlinedoc/todolist.txt
 /src/Tools/offlinedoc/wikifiles.txt
+OpenSCAD_rc.py
 .subuser-dev
 /\.idea/
diff --git a/src/Mod/OpenSCAD/importCSG.py b/src/Mod/OpenSCAD/importCSG.py
index 3cd6120a4f..50fd232951 100644
--- a/src/Mod/OpenSCAD/importCSG.py
+++ b/src/Mod/OpenSCAD/importCSG.py
@@ -1011,6 +1011,8 @@ def p_circle_action(p) :
     'circle_action : circle LPAREN keywordargument_list RPAREN SEMICOL'
     if printverbose: print("Circle : "+str(p[3]))
     r = float(p[3]['r'])
+    # Avoid zero radius
+    if r == 0 : r = 0.00001
     n = int(p[3]['$fn'])
     fnmax = FreeCAD.ParamGet(\
         "User parameter:BaseApp/Preferences/Mod/OpenSCAD").\