Merge branch 'master' into develop

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '8.7.0'
+__version__ = '8.7.1'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/website/router.py

@@ -348,9 +348,9 @@ def sync_global_search():
 							frappe.flags.update_global_search.append(
 								dict(doctype='Static Web Page',
 									name=route,
-									content=frappe.text_type(text),
+									content=text_type(text),
 									published=1,
-									title=soup.title.string,
+									title=text_type(soup.title.string),
 									route=route))
 
 						except Exception: