Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

src/Mod/Arch/ArchWindow.py

@@ -25,7 +25,7 @@ import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
 from FreeCAD import Vector
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
+    from PySide import QtCore, QtGui, QtSvg
     from DraftTools import translate
 else:
     def translate(ctxt,txt):

src/Mod/Draft/DraftTools.py

@@ -164,6 +164,9 @@ def getSupport(args=None):
             self.display(plane.axis)
     except:
         pass
+    if obj.isDerivedFrom("Part::Part2DObject"):
+        # make sure we don't set another Draft object as support
+        return None
     return obj
 
 def hasMod(args,mod):