From 0906b6f13719df8aeb2eff7edf995ddcbf870aa2 2017-06-29 15:00:56
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: 2017-06-29 15:00:56
Subject: [PATCH] Merge pull request #10683 from ipython/auto-backport-of-pr-10676

Backport PR #10676 on branch 5.x
---

diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index 30cb93d..6b25aaa 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -365,12 +365,10 @@ def load_default_config(ipython_dir=None):
         ipython_dir = get_ipython_dir()
 
     profile_dir = os.path.join(ipython_dir, 'profile_default')
-
-    config = Config()
-    for cf in Application._load_config_files("ipython_config", path=profile_dir):
-        config.update(cf)
-
-    return config
+    app = TerminalIPythonApp()
+    app.config_file_paths.append(profile_dir)
+    app.load_config_file()
+    return app.config
 
 launch_new_instance = TerminalIPythonApp.launch_instance