diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 1cdf6c2a..3e66bce6 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -3,11 +3,12 @@
 module Jekyll
   class Renderer
 
-    attr_reader :document, :site
+    attr_reader :document, :site, :payload
 
-    def initialize(site, document)
+    def initialize(site, document, payload = nil)
       @site     = site
       @document = document
+      @payload  = payload
     end
 
     # Determine which converters to use based on this document's
@@ -32,7 +33,7 @@ module Jekyll
     def run
       payload = Utils.deep_merge_hashes({
         "page" => document.to_liquid
-      }, site.site_payload)
+      }, payload || site.site_payload)
 
       info = {
         filters:   [Jekyll::Filters],
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3ddda474..85c479bf 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -292,9 +292,10 @@ module Jekyll
     def render
       relative_permalinks_deprecation_method
 
+      payload = site_payload
       collections.each do |label, collection|
         collection.docs.each do |document|
-          document.output = Jekyll::Renderer.new(self, document).run if document.regenerate?
+          document.output = Jekyll::Renderer.new(self, document, payload).run if document.regenerate?
         end
       end
 
diff --git a/test/test_deprecator.rb b/test/test_deprecator.rb
new file mode 100644
index 00000000..7be838d2
--- /dev/null
+++ b/test/test_deprecator.rb
@@ -0,0 +1,6 @@
+require 'helper'
+
+class TestDeprecator < Test::Unit::TestCase
+  def test_no_subcommand
+  end
+end