Merge branch 'master' into xsdata

Conflicts:
	lib/Slic3r/GCode.pm
	xs/src/Point.hpp

xs/src/Point.hpp

@@ -10,6 +10,8 @@ extern "C" {
 
 #include <math.h>
 
+namespace Slic3r {
+
 class Point
 {
     public:
@@ -36,4 +38,6 @@ point2perl(Point& point) {
     return sv_bless(newRV_noinc((SV*)av), gv_stashpv("Slic3r::Point", GV_ADD));
 }
 
+}
+
 #endif