Merge branch 'develop'

frappe/__version__.py

 from __future__ import unicode_literals
-__version__ = "6.17.1"
+__version__ = "6.17.2"

frappe/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.17.1"
+app_version = "6.17.2"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

frappe/patches/v6_16/feed_doc_owner.py

@@ -28,3 +28,5 @@ def execute():
 					"name": name,
 					"owner": owner
 				})
+
+		frappe.db.commit()

frappe/templates/pages/message.html

@@ -2,7 +2,11 @@
 
 {% block title %}{{ title }}{% endblock %}
 
-{% block header %}{{ header }}{% endblock %}
+{% block header %}
+	{% if header is defined -%}
+	<h1>{{ header }}</h1>
+	{%- endif %}
+{% endblock %}
 
 {% block page_content %}
 <!-- no-sidebar -->

setup.py

 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.17.1"
+version = "6.17.2"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(