diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/debian/changelog freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/debian/changelog
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/debian/changelog	2016-08-26 21:17:34.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/debian/changelog	2016-08-29 22:30:23.000000000 +0000
@@ -1,8 +1,8 @@
-freecad-daily (0.17~alpha1+git201608262117~ubuntu15.10.1) wily; urgency=low
+freecad-daily (0.17~alpha1+git201608292230~ubuntu15.10.1) wily; urgency=low
 
   * Auto build.
 
- -- sgrogan <clhclh@earthlink.net>  Fri, 26 Aug 2016 21:17:34 +0000
+ -- sgrogan <clhclh@earthlink.net>  Mon, 29 Aug 2016 22:30:23 +0000
 
 freecad-daily (0.17~alpha1-1xenial1) xenial; urgency=low
 
diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/debian/git-build-recipe.manifest freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/debian/git-build-recipe.manifest
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/debian/git-build-recipe.manifest	2016-08-26 21:17:34.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/debian/git-build-recipe.manifest	2016-08-29 22:30:23.000000000 +0000
@@ -1,4 +1,4 @@
-# git-build-recipe format 0.4 deb-version {debupstream}+git201608262117
-lp:~freecad-maintainers/+git/gitmaster git-commit:18e519571af104abc0e09ab63ec8786143598df5
+# git-build-recipe format 0.4 deb-version {debupstream}+git201608292230
+lp:~freecad-maintainers/+git/gitmaster git-commit:8bd57848da86d653a6dc79479b082f43e1a206c3
 merge packaging lp:~freecad-maintainers/+git/gitpackaging git-commit:107ead02034e3932f5df0438eceff9dbf40cad36
-merge versioning lp:~freecad-maintainers/+git/gitversioning git-commit:699553b2f0fd7c4ec5f2eae7669bc4527f0a8d5e
+merge versioning lp:~freecad-maintainers/+git/gitversioning git-commit:f31c587647803fb12ada7a990761604c7f737b9b
diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Build/Version.h freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Build/Version.h
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Build/Version.h	2016-08-26 21:17:34.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Build/Version.h	2016-08-29 22:30:23.000000000 +0000
@@ -4,12 +4,12 @@
 #define FCVersionMinor "17"
 #define FCVersionName  "Vulcan"
 // test: $Format:Hash (%H), Date: %ci$
-#define FCRevision      "8317 (Git)"      //Highest committed revision number
-#define FCRevisionDate  "2016/08/26 20:48:40"     //Date of highest committed revision
+#define FCRevision      "8321 (Git)"      //Highest committed revision number
+#define FCRevisionDate  "2016/08/29 14:04:23"     //Date of highest committed revision
 #define FCRepositoryURL "git://github.com/FreeCAD/FreeCAD.git master"      //Repository URL of the working copy
 
 // Git relevant stuff
-#define FCRepositoryHash   "18e519571af104abc0e09ab63ec8786143598df5"
+#define FCRepositoryHash   "8bd57848da86d653a6dc79479b082f43e1a206c3"
 #define FCRepositoryBranch "master"
 
 
diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Gui/Icons/Std_WindowCascade.svg freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Gui/Icons/Std_WindowCascade.svg
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Gui/Icons/Std_WindowCascade.svg	2016-08-26 21:17:07.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Gui/Icons/Std_WindowCascade.svg	2016-08-29 22:30:07.000000000 +0000
@@ -13,8 +13,9 @@
    height="64"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Std_WindowCascade.svg">
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="Std_WindowCascade.svg"
+   viewBox="0 0 64 64">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -24,18 +25,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.34375"
-     inkscape:cx="32"
-     inkscape:cy="31.918987"
+     inkscape:zoom="14.935938"
+     inkscape:cx="21.237368"
+     inkscape:cy="29.914426"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     showgrid="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1329"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11630" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -53,6 +59,27 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-988.36218)">
+    <rect
+       y="1015.3622"
+       x="15"
+       height="13.999994"
+       width="37"
+       id="rect11641"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64870489;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.57959182" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64870489;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.57959182"
+       id="rect11643"
+       width="37"
+       height="13.999994"
+       x="21"
+       y="1033.3622" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64870489;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.57959182"
+       id="rect8154"
+       width="37"
+       height="13.999994"
+       x="5"
+       y="998.36218" />
     <g
        id="g4906"
        transform="matrix(1.0494463,0,0,1.0388156,2.037459,-36.87361)">
@@ -61,18 +88,18 @@
          inkscape:connector-curvature="0"
          id="path4900"
          d="m 2.4303797,991.0356 35.8886073,-0.16203 0,19.60503 -35.8886073,0.081 z"
-         style="fill:none;stroke:#000087;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000087;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path4902"
          d="m 2.7544304,994.68117 35.1594936,0"
-         style="fill:none;stroke:#000087;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000087;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path4904"
          d="m 3.5645569,993.30395 6.8050641,0"
-         style="fill:none;stroke:#ffffff;stroke-width:3.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:3.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <g
        transform="matrix(1.0494463,0,0,1.0388156,11.806567,-19.962327)"
@@ -82,18 +109,18 @@
          inkscape:connector-curvature="0"
          id="path4900-7"
          d="m 2.4303797,991.0356 35.8886073,-0.16203 0,19.60503 -35.8886073,0.081 z"
-         style="fill:none;stroke:#000087;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000087;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path4902-2"
          d="m 2.7544304,994.68117 35.1594936,0"
-         style="fill:none;stroke:#000087;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000087;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path4904-0"
          d="m 3.5645569,993.30395 6.8050641,0"
-         style="fill:none;stroke:#ffffff;stroke-width:3.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:3.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <g
        transform="matrix(1.0494463,0,0,1.0388156,18.311135,-2.453737)"
@@ -103,18 +130,18 @@
          inkscape:connector-curvature="0"
          id="path4900-5"
          d="m 2.4303797,991.0356 35.8886073,-0.16203 0,19.60503 -35.8886073,0.081 z"
-         style="fill:none;stroke:#000087;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000087;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path4902-4"
          d="m 2.7544304,994.68117 35.1594936,0"
-         style="fill:none;stroke:#000087;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000087;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path4904-7"
          d="m 3.5645569,993.30395 6.8050641,0"
-         style="fill:none;stroke:#ffffff;stroke-width:3.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:3.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Gui/Icons/Std_WindowNext.svg freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Gui/Icons/Std_WindowNext.svg
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Gui/Icons/Std_WindowNext.svg	2016-08-26 21:17:07.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Gui/Icons/Std_WindowNext.svg	2016-08-29 22:30:07.000000000 +0000
@@ -13,8 +13,9 @@
    height="64"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Std_WindowNext.svg">
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="Std_WindowNext.svg"
+   viewBox="0 0 64 64">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -25,17 +26,22 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.375"
-     inkscape:cx="32"
+     inkscape:cx="16.484848"
      inkscape:cy="32"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     showgrid="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1329"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11622" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -53,14 +59,21 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-988.36218)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.03864074;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.57959182"
+       id="rect8154"
+       width="33.000004"
+       height="23.999994"
+       x="5"
+       y="1000.3622" />
     <path
-       style="fill:none;stroke:#000087;stroke-width:2.61029363;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#000087;stroke-width:2.61029363;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 4.588012,995.70034 33.137913,0.15491 -0.323232,28.93165 -32.814681,-0.1584 z"
        id="path4900"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:none;stroke:#000087;stroke-width:6.2647047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#000087;stroke-width:6.2647047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 4.9280858,999.48742 33.9081012,0.0808"
        id="path4902"
        inkscape:connector-curvature="0"
@@ -78,7 +91,7 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
-       style="fill:#13e0ec;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#13e0ec;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 24.646465,1015.6753 -0.242425,17.9394 20.121212,-2e-4 0,8.8889 14.141415,-17.9394 -14.222222,-18.101 0.08081,9.3737 z"
        id="path4369"
        inkscape:connector-curvature="0"
diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Gui/Icons/Std_WindowPrev.svg freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Gui/Icons/Std_WindowPrev.svg
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Gui/Icons/Std_WindowPrev.svg	2016-08-26 21:17:07.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Gui/Icons/Std_WindowPrev.svg	2016-08-29 22:30:07.000000000 +0000
@@ -13,8 +13,9 @@
    height="64"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Std_WindowPrev.svg">
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="Std_WindowPrev.svg"
+   viewBox="0 0 64 64">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -24,18 +25,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.375"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="13.6125"
+     inkscape:cx="21.796143"
+     inkscape:cy="26.071625"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     showgrid="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1329"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11014" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -53,14 +59,21 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-988.36218)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.03864074;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.57959182"
+       id="rect8154"
+       width="33.000004"
+       height="23.999994"
+       x="26"
+       y="999.36218" />
     <path
-       style="fill:none;stroke:#000087;stroke-width:2.61029363;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#000087;stroke-width:2.61029363;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 26.16377,994.00337 33.137913,0.15491 -0.323232,28.93162 -32.814681,-0.1584 z"
        id="path4900"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:none;stroke:#000087;stroke-width:6.2647047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#000087;stroke-width:6.2647047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 26.503843,997.79045 33.908102,0.0808"
        id="path4902"
        inkscape:connector-curvature="0"
@@ -78,7 +91,7 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
-       style="fill:#13e0ec;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#13e0ec;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 38.802488,1033.0249 0.04601,-17.941 -20.120004,0.2205 -0.09732,-8.8884 -13.9441637,18.0932 14.4195427,17.9442 -0.18343,-9.3723 z"
        id="path4369"
        inkscape:connector-curvature="0"
diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Gui/Icons/Std_WindowTileVer.svg freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Gui/Icons/Std_WindowTileVer.svg
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Gui/Icons/Std_WindowTileVer.svg	2016-08-26 21:17:07.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Gui/Icons/Std_WindowTileVer.svg	2016-08-29 22:30:07.000000000 +0000
@@ -13,8 +13,9 @@
    height="64"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Std_WindowTileVer.svg">
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="Std_WindowTileVer.svg"
+   viewBox="0 0 64 64">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -24,18 +25,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.359375"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="13.595313"
+     inkscape:cx="16.804589"
+     inkscape:cy="25.850487"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     showgrid="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1329"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11651" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -53,38 +59,45 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-988.36218)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.5428977;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.57959182"
+       id="rect8154"
+       width="52"
+       height="45.999977"
+       x="6"
+       y="1000.3622" />
     <path
-       style="fill:none;stroke:#000087;stroke-width:3.46466041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#000087;stroke-width:3.46466041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0379484,993.06175 25.2675216,-0.13198 0.07918,54.31883 -25.3466936,-0.1324 z"
        id="path4900-7"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:none;stroke:#000087;stroke-width:8.31518459;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#000087;stroke-width:8.31518459;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.5155908,997.81191 24.0344822,-0.0792"
        id="path4902-2"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
-       style="fill:none;stroke:#000087;stroke-width:3.46466041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#000087;stroke-width:3.46466041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 30.406356,992.95707 28.482782,0.0269 0.158547,54.43433 -28.641329,-0.1327 z"
        id="path4900-5"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:none;stroke:#000087;stroke-width:8.31518459;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#000087;stroke-width:8.31518459;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 30.883999,997.70732 29.152093,-0.31744"
        id="path4902-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
-       style="fill:none;stroke:#ffffff;stroke-width:5.19699049;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#ffffff;stroke-width:5.19699049;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 32.157378,995.91279 10.030483,0"
        id="path4904-7"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
-       style="fill:none;stroke:#ffffff;stroke-width:5.19699049;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#ffffff;stroke-width:5.19699049;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 6.6525246,996.34218 10.0304844,0"
        id="path4904-7-8"
        inkscape:connector-curvature="0"
diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Mod/Arch/ArchPipe.py freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Mod/Arch/ArchPipe.py
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Mod/Arch/ArchPipe.py	2016-08-26 21:17:07.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Mod/Arch/ArchPipe.py	2016-08-29 22:30:08.000000000 +0000
@@ -69,8 +69,7 @@
     _ArchPipeConnector(obj)
     obj.Pipes = pipes
     if not radius:
-        p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch")
-        radius = p.GetFloat("PipeDiameter",50)
+        radius = pipes[0].Diameter
     obj.Radius = radius
     if FreeCAD.GuiUp:
         _ViewProviderPipe(obj.ViewObject)
@@ -275,6 +274,8 @@
         obj.setEditorMode("ConnectorType",1)
 
     def execute(self,obj):
+        
+        tol = 1 # tolerance for alignment. This is only visual, we can keep it low...
 
         import math,Part,DraftGeomUtils,ArchCommands
         if len(obj.Pipes) < 2:
@@ -301,6 +302,7 @@
             point = wires[0].Vertexes[-1].Point
         else:
             FreeCAD.Console.PrintError(translate("Arch","Common vertex not found\n"))
+            return
         if order[0] == "start":
             v1 = wires[0].Vertexes[1].Point.sub(wires[0].Vertexes[0].Point).normalize()
         else:
@@ -314,7 +316,7 @@
         if len(obj.Pipes) == 2:
             if obj.ConnectorType != "Corner":
                 obj.ConnectorType = "Corner"
-            if round(v1.getAngle(v2),4) in [0,3.1416]:
+            if round(v1.getAngle(v2),tol) in [0,round(math.pi,tol)]:
                 FreeCAD.Console.PrintError(translate("Arch","Pipes are already aligned\n"))
                 return
             normal = v2.cross(v1)
@@ -348,11 +350,11 @@
                 v3 = wires[2].Vertexes[1].Point.sub(wires[2].Vertexes[0].Point).normalize()
             else:
                 v3 = wires[2].Vertexes[-2].Point.sub(wires[2].Vertexes[-1].Point).normalize()
-            if round(v1.getAngle(v2),4) in [0,3.1416]:
+            if round(v1.getAngle(v2),tol) in [0,round(math.pi,tol)]:
                 pair = [v1,v2,v3]
-            elif round(v1.getAngle(v3),4) in [0,3.1416]:
+            elif round(v1.getAngle(v3),tol) in [0,round(math.pi,tol)]:
                 pair = [v1,v3,v2]
-            elif round(v2.getAngle(v3),4) in [0,3.1416]:
+            elif round(v2.getAngle(v3),tol) in [0,round(math.pi,tol)]:
                 pair = [v2,v3,v1]
             else:
                 FreeCAD.Console.PrintError(translate("Arch","At least 2 pipes must aligned\n"))
diff -Nru freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Mod/Draft/importDXF.py freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Mod/Draft/importDXF.py
--- freecad-daily-0.17~alpha1+git201608262117~ubuntu15.10.1/src/Mod/Draft/importDXF.py	2016-08-26 21:17:07.000000000 +0000
+++ freecad-daily-0.17~alpha1+git201608292230~ubuntu15.10.1/src/Mod/Draft/importDXF.py	2016-08-29 22:30:08.000000000 +0000
@@ -1815,10 +1815,12 @@
             for ob in exportList:
                 print("processing "+str(ob.Name))
                 if ob.isDerivedFrom("Part::Feature"):
-                    if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft").GetBool("dxfmesh"):
-                        sh = None
-                        if not ob.Shape.isNull():
-                            writeMesh(ob,dxf)
+                    sh = None
+                    if ob.Shape.isNull():
+                        print ("Null shape - skipping")
+                        continue
+                    elif FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft").GetBool("dxfmesh"):
+                        writeMesh(ob,dxf)
                     elif gui and FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft").GetBool("dxfproject"):
                         direction = FreeCADGui.ActiveDocument.ActiveView.\
                                 getViewDirection().multiply(-1)
@@ -1829,29 +1831,28 @@
                         else:
                             sh = ob.Shape
                     if sh:
-                        if not sh.isNull():
-                            if sh.ShapeType == 'Compound':
-                                if (len(sh.Wires) == 1):
-                                    # only one wire in this compound, no lone edge -> polyline
-                                    if (len(sh.Wires[0].Edges) == len(sh.Edges)):
-                                        writeShape(sh,ob,dxf,nospline,lwPoly)
-                                    else:
-                                        # 1 wire + lone edges -> block
-                                        block = getBlock(sh,ob,lwPoly)
-                                        dxf.blocks.append(block)
-                                        dxf.append(dxfLibrary.Insert(name=ob.Name.upper(),
-                                                                     color=getACI(ob),
-                                                                     layer=getGroup(ob)))
+                        if sh.ShapeType == 'Compound':
+                            if (len(sh.Wires) == 1):
+                                # only one wire in this compound, no lone edge -> polyline
+                                if (len(sh.Wires[0].Edges) == len(sh.Edges)):
+                                    writeShape(sh,ob,dxf,nospline,lwPoly)
                                 else:
-                                    # all other cases: block
+                                    # 1 wire + lone edges -> block
                                     block = getBlock(sh,ob,lwPoly)
                                     dxf.blocks.append(block)
                                     dxf.append(dxfLibrary.Insert(name=ob.Name.upper(),
-                                                                      color=getACI(ob),
-                                                                      layer=getGroup(ob)))
-
+                                                                 color=getACI(ob),
+                                                                 layer=getGroup(ob)))
                             else:
-                                writeShape(sh,ob,dxf,nospline,lwPoly)
+                                # all other cases: block
+                                block = getBlock(sh,ob,lwPoly)
+                                dxf.blocks.append(block)
+                                dxf.append(dxfLibrary.Insert(name=ob.Name.upper(),
+                                                                  color=getACI(ob),
+                                                                  layer=getGroup(ob)))
+
+                        else:
+                            writeShape(sh,ob,dxf,nospline,lwPoly)
 
                 elif Draft.getType(ob) == "Annotation":
                     # texts