From ac9fa413a5675ee73171e532c575145f7a59872b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 30 Nov 2015 14:34:01 -0800
Subject: [PATCH] Convertible should make layout data accessible via 'layout'

Not via 'page'. Erroneous!

Fixes #4117.
---
 lib/jekyll/convertible.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 12151395..016ff245 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -210,7 +210,13 @@ module Jekyll
 
       while layout
         Jekyll.logger.debug "Rendering Layout:", path
-        payload = Utils.deep_merge_hashes(payload, {"content" => output, "page" => layout.data})
+        payload = Utils.deep_merge_hashes(
+          payload,
+          {
+            "content" => output,
+            "layout"  => layout.data
+          }
+        )
 
         self.output = render_liquid(layout.content,
                                          payload,