Merge branch 'stable'

CHANGES

@@ -234,6 +234,7 @@ Bugs fixed
   python-mecab is not installed.
 * #1674: Do not crash if a module's ``__all__`` is not a list of strings.
 * #1673: Fix crashes with :confval:`nitpick_ignore` and ``:doc:`` references.
+* #1686: ifconfig directive doesn't care about default config values.
 
 Documentation
 -------------

sphinx/ext/ifconfig.py

@@ -49,7 +49,8 @@ class IfConfig(Directive):
 
 
 def process_ifconfig_nodes(app, doctree, docname):
-    ns = app.config.__dict__.copy()
+    ns = {k: app.config[k] for k in app.config.values}
+    ns.update(app.config.__dict__.copy())
     ns['builder'] = app.builder.name
     for node in doctree.traverse(ifconfig):
         try: