Merge branch 'maintenance' into devel

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -74,6 +74,25 @@
 * [#1047](https://github.com/foosel/OctoPrint/issues/1047) - Fixed 90 degree
   webcam rotation for iOS Safari.
 
+## 1.2.17rc1 (2016-10-06)
+
+### Improvements
+
+  * Files like `config.yaml` etc will now persist their permissions, with a lower and upper permission bounds for sanitization (e.g. removing executable flags on configuration files but keeping group read/write permissions if found).
+  * Log full stack trace on socket connection errors when debug logging for `octoprint.server.util.sockjs` is enabled
+  * ``SettingsPlugin``s may now mark configuration paths as restricted so that they are not returned on the REST API
+  * Updated LESS.js version
+
+### Bug fixes
+
+  * [#1531](https://github.com/foosel/OctoPrint/issues/1531) - Fixed encoding bug in HTTP request processing triggered by content type headers on form data fields
+  * Fixed forced `config.yaml` save on startup caused by mistakenly assuming that printer parameters were always migrated.
+  * Fixed issue causing ``remember_me`` cookie not to be deleted properly on logout
+  * Fixed broken filter toggling on ``ItemListHelper`` class used for various lists throughout the web interface
+  * Fixed an issue with the preliminary page never reporting that the server is now up if the page generated during preliminary caching had no cache headers set (e.g. because it contained the first run setup wizard)
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.2.16...1.2.17rc1))
+
 ## 1.2.16 (2016-09-23)
 
 ### Improvements

SUPPORTERS.md

@@ -7,10 +7,10 @@ thanks to everyone who contributed!
 ## Patreon Patrons
 
   * 3D Moniak
-  * alephobjects
+  * Aleph Objects, Inc.
   * Andrew Moorby
   * Arnljot Arntsen
-  * Aurelio Bernal Ramírez
+  * Aurelio Bernal
   * Bart Zudell
   * Boris Hussein
   * Brad Jackson
@@ -30,30 +30,32 @@ thanks to everyone who contributed!
   * Ernesto Martinez
   * Exovite
   * Frank Sander
-  * georgeroblesjr
-  * Gregor Luetolf
+  * Gary Deen
+  * Gary N McKinney
+  * George Robles
+  * Gregor Lütolf
   * J. Eckert
   * Jason Galarneau
   * Joe Korzeniewski
   * Josh Daniels
-  * Joshua Gregory
+  * Joshua David Gregory
   * Kaile Riser
   * Kale Stedman
   * Kazuhiro Ogura
   * Korneel Bullens
-  * Kyle Gress
+  * Lamin Kivelä
+  * M Khorakiwala
   * Makespace Madrid
   * Mark Lane
   * Mark Qvist
   * Mark Walker
   * Masayoshi Mitsui
-  * Michael McDargh
-  * Mikey
+  * Michael Aumock
+  * Michael McDargh Sr
   * Miles Flavel
-  * Mohammed Khorakiwala
+  * Nikolai Langer
   * Noe Ruiz
   * Patrick McGinnis
-  * Paul Generes
   * Peter Grace
   * Peter Schmehl
   * PRINT3Dforum.com
@@ -61,15 +63,14 @@ thanks to everyone who contributed!
   * Roy Cortes
   * Samer Najia
   * SD3D
+  * SeeMeCNC
   * Shane Ekerbicer
   * Simon Hallam
   * Stefan Krister
-  * stefi davis
   * Steven Pearson
   * Sven Mueller
   * Terrance Shaw
   * Thomas Hatley
   * Trent Shumay
-  * Xpandedreality
 
-and 905 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!
+and 933 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!

src/octoprint/server/util/flask.py

@@ -414,6 +414,14 @@ class OctoPrintFlaskResponse(flask.Response):
 		# add request specific cookie suffix to name
 		flask.Response.set_cookie(self, key + flask.request.cookie_suffix, *args, **kwargs)
 
+	def delete_cookie(self, key, path='/', domain=None):
+		flask.Response.delete_cookie(self, key, path=path, domain=domain)
+
+		# we also still might have a cookie left over from before we started prefixing, delete that manually
+		# without any pre processing (no path prefix, no key suffix)
+		flask.Response.set_cookie(self, key, expires=0, max_age=0, path=path, domain=domain)
+
+
 #~~ passive login helper
 
 def passive_login():