From 45f69bb8cdf1050ea6c35da837e42dd9e0d8eda7 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 26 Oct 2015 17:27:26 -0700
Subject: [PATCH] Utils: deep_merge_hashes should also merge default_proc

If the target hash's default_proc isn't set, overwrite with the new hash's default_proc.

/cc #4064
---
 lib/jekyll/utils.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 86d24cef..c30a986a 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -34,6 +34,10 @@ module Jekyll
         target[key] = overwrite[key]
       end
 
+      if target.default_proc.nil?
+        target.default_proc = overwrite.default_proc
+      end
+
       target
     end