Merge branch 'Develop'

# Conflicts:
#	cps/__init__.py

cps/__init__.py

@@ -33,7 +33,7 @@ from flask_login import LoginManager
 from flask_babel import Babel
 from flask_principal import Principal
 
-from . import logger, cache_buster, cli, config_sql, ub, db, services
+from . import config_sql, logger, cache_buster, cli, ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 try:
@@ -65,7 +65,6 @@ lm = LoginManager()
 lm.login_view = 'web.login'
 lm.anonymous_user = ub.Anonymous
 
-
 ub.init_db(cli.settingspath)
 # pylint: disable=no-member
 config = config_sql.load_configuration(ub.session)
@@ -78,11 +77,12 @@ _BABEL_TRANSLATIONS = set()
 
 log = logger.create()
 
+from . import services
 
 def create_app():
     try:
         app.wsgi_app = ReverseProxied(ProxyFix(app.wsgi_app, x_for=1, x_host=1))
-    except ValueError:
+    except (ValueError, TypeError):
         app.wsgi_app = ReverseProxied(ProxyFix(app.wsgi_app))
     # For python2 convert path to unicode
     if sys.version_info < (3, 0):