Merge branch 'develop'

frappe/__version__.py

 from __future__ import unicode_literals
-__version__ = "6.25.2"
+__version__ = "6.25.3"

frappe/hooks.py

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

frappe/patches/v6_24/set_language_as_code.py

@@ -9,6 +9,7 @@ def execute():
 		system_settings = frappe.get_doc('System Settings', 'System Settings')
 		if get_lang_dict().get(language, language) != system_settings.language:
 			system_settings.language = get_lang_dict().get(language, language)
+			system_settings.flags.ignore_mandatory=True
 			system_settings.save()
 
 	for user in frappe.get_all('User', fields=['name', 'language']):

setup.py

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