Merge branch 'develop'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.15.1"
+__version__ = "6.15.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.15.1"
+app_version = "6.15.2"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

frappe/website/doctype/website_theme/website_theme.py

@@ -83,5 +83,7 @@ def add_website_theme(context):
 def get_active_theme():
 	website_theme = frappe.db.get_value("Website Settings", "Website Settings", "website_theme")
 	if website_theme:
-		return frappe.get_doc("Website Theme", website_theme)
-
+		try:
+			return frappe.get_doc("Website Theme", website_theme)
+		except frappe.DoesNotExistError:
+			pass

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.15.1"
+version = "6.15.2"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(