From 9f40bf1da9952f56dff6f55b2fc54fb8bce442b8 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Tue, 10 Feb 2015 14:05:14 -0200
Subject: [PATCH 1/3] Drawing: reset the default template to the classic one

---
 src/Mod/Drawing/Gui/Command.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp
index 53a37bd45..69e373f3c 100644
--- a/src/Mod/Drawing/Gui/Command.cpp
+++ b/src/Mod/Drawing/Gui/Command.cpp
@@ -175,8 +175,11 @@ Gui::Action * CmdDrawingNewPage::createAction(void)
             a->setProperty("Template", dir.absoluteFilePath(dir[i]));
 
             if (id == 3) {
-                defaultAction = a;
-                defaultId = pcAction->actions().size() - 1;
+                if (!defaultAction) {
+                    // set the first found A3 (A3_Landscape) as default
+                    defaultAction = a;
+                    defaultId = pcAction->actions().size() - 1;
+                }
             }
         }
     }

From 02efe588181d07b0480188380c00f841146ab95c Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Wed, 11 Feb 2015 15:50:18 -0200
Subject: [PATCH 2/3] Fixed typo

---
 src/Mod/Sketcher/Gui/CommandConstraints.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index 8e9f305cb..25517244e 100644
--- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -2715,7 +2715,7 @@ CmdSketcherConstrainInternalAlignment::CmdSketcherConstrainInternalAlignment()
     sAppModule      = "Sketcher";
     sGroup          = QT_TR_NOOP("Sketcher");
     sMenuText       = QT_TR_NOOP("Constrain InternalAlignment");
-    sToolTipText    = QT_TR_NOOP("Constraint an element to be aligned with the internal geometry of another element");
+    sToolTipText    = QT_TR_NOOP("Constrains an element to be aligned with the internal geometry of another element");
     sWhatsThis      = sToolTipText;
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_InternalAlignment";

From fe3bb2c5e8f95554432ac936f8bb2318c3fd30b1 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Wed, 11 Feb 2015 16:08:34 -0200
Subject: [PATCH 3/3] Draft: Small fix in DXF importer - fixes #1961

---
 src/Mod/Draft/importDXF.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py
index 4dc2f3e76..745322bea 100644
--- a/src/Mod/Draft/importDXF.py
+++ b/src/Mod/Draft/importDXF.py
@@ -47,12 +47,13 @@ from Draft import _Dimension, _ViewProviderDimension
 from FreeCAD import Vector
 
 gui = FreeCAD.GuiUp
+draftui = None
 if gui:
     import FreeCADGui
-try: 
-    draftui = FreeCADGui.draftToolBar
-except AttributeError: 
-    draftui = None
+    try: 
+        draftui = FreeCADGui.draftToolBar
+    except AttributeError: 
+        pass
     
 # check dxfLibrary version
 try: