diff --git a/build/Temboo-1.1.5.zip.sha b/build/Temboo-1.1.5.zip.sha
deleted file mode 100644
index efdd318c860..00000000000
--- a/build/Temboo-1.1.5.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-b9e25c8b608cd27bb36b4fb4b96b5f0b7b8262e5
diff --git a/build/Temboo-1.1.6.zip.sha b/build/Temboo-1.1.6.zip.sha
new file mode 100644
index 00000000000..d27b603c1d3
--- /dev/null
+++ b/build/Temboo-1.1.6.zip.sha
@@ -0,0 +1 @@
+9199f18f14abb0154c0773e54d0cdcd6dd3de599
diff --git a/build/build.xml b/build/build.xml
index 15c36e056b7..ce41988ba1e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -217,7 +217,7 @@
-
+
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 69da4e4833e..04c4b0ced26 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -5,6 +5,7 @@ ARDUINO 1.6.10
[core]
* fixed a small bug that caused a compile error on some 3rd party derivatives
boards based on Leonardo
+* sam: added snprintf_P to avr/pgmspace.h stub. Thanks @jantje
[libraries]
diff --git a/hardware/arduino/avr/cores/arduino/Print.h b/hardware/arduino/avr/cores/arduino/Print.h
index 7b53aa4d17e..7f60088d729 100644
--- a/hardware/arduino/avr/cores/arduino/Print.h
+++ b/hardware/arduino/avr/cores/arduino/Print.h
@@ -81,4 +81,6 @@ class Print
size_t println(void);
};
+template inline Print &operator<<(Print &obj, T arg) { obj.print(arg); return obj; }
+
#endif
diff --git a/hardware/arduino/sam/cores/arduino/Print.h b/hardware/arduino/sam/cores/arduino/Print.h
index 7b53aa4d17e..7f60088d729 100644
--- a/hardware/arduino/sam/cores/arduino/Print.h
+++ b/hardware/arduino/sam/cores/arduino/Print.h
@@ -81,4 +81,6 @@ class Print
size_t println(void);
};
+template inline Print &operator<<(Print &obj, T arg) { obj.print(arg); return obj; }
+
#endif
diff --git a/hardware/arduino/sam/cores/arduino/avr/pgmspace.h b/hardware/arduino/sam/cores/arduino/avr/pgmspace.h
index d1599f9f349..0f732bbad94 100644
--- a/hardware/arduino/sam/cores/arduino/avr/pgmspace.h
+++ b/hardware/arduino/sam/cores/arduino/avr/pgmspace.h
@@ -97,6 +97,7 @@ typedef const void* uint_farptr_t;
#define memcmp_PF(s1, s2, n) memcmp((s1), (s2), (n))
#define sprintf_P(s, f, ...) sprintf((s), (f), __VA_ARGS__)
+#define snprintf_P(s, f, ...) snprintf((s), (f), __VA_ARGS__)
#define pgm_read_byte(addr) (*(const unsigned char *)(addr))
#define pgm_read_word(addr) (*(const unsigned short *)(addr))