diff --git a/mustache.js b/mustache.js
index ecd2b862a..6b4565ce8 100644
--- a/mustache.js
+++ b/mustache.js
@@ -68,7 +68,7 @@
   var spaceRe = /\s+/;
   var equalsRe = /\s*=/;
   var curlyRe = /\s*\}/;
-  var tagRe = /#|\^|\/|>|\{|&|=|!/;
+  var tagRe = /#|\^|\/|>|\{|&|=|!|\$|</;
 
   /**
    * Breaks up the given `template` string into a tree of tokens. If the `tags`
@@ -190,7 +190,7 @@
       token = [ type, value, start, scanner.pos ];
       tokens.push(token);
 
-      if (type === '#' || type === '^') {
+      if (type === '#' || type === '^' || type === '$' || type === '<') {
         sections.push(token);
       } else if (type === '/') {
         // Check section nesting.
@@ -259,6 +259,8 @@
       token = tokens[i];
 
       switch (token[0]) {
+      case '$':
+      case '<':
       case '#':
       case '^':
         collector.push(token);
@@ -344,6 +346,7 @@
    */
   function Context (view, parentContext) {
     this.view = view;
+    this.blocks = {};
     this.cache = { '.': this.view };
     this.parent = parentContext;
   }
@@ -356,6 +359,42 @@
     return new Context(view, this);
   };
 
+  /**
+   * Set a value in the current block context.
+   */
+  Context.prototype.setBlockVar = function set (name, value) {
+    var blocks = this.blocks;
+
+    blocks[name] = value;
+
+    return value;
+  };
+
+  /**
+   * Clear all current block vars.
+   */
+  Context.prototype.clearBlockVars = function clearBlockVars () {
+    this.blocks = {};
+  };
+
+  /**
+   * Get a value only from the current block context.
+   */
+  Context.prototype.getBlockVar = function getBlockVar (name) {
+    var blocks = this.blocks;
+
+    var value;
+    if (blocks.hasOwnProperty(name)) {
+      value = blocks[name];
+    } else {
+      if (this.parent) {
+        value = this.parent.getBlockVar(name);
+      }
+    }
+    // Can return undefined.
+    return value;
+  };
+
   /**
    * Returns the value of the given name in this context, traversing
    * up the context hierarchy if the value is absent in this context's view.
@@ -478,6 +517,8 @@
       if (symbol === '#') value = this.renderSection(token, context, partials, originalTemplate);
       else if (symbol === '^') value = this.renderInverted(token, context, partials, originalTemplate);
       else if (symbol === '>') value = this.renderPartial(token, context, partials, originalTemplate);
+      else if (symbol === '<') value = this.renderBlock(token, context, partials, originalTemplate);
+      else if (symbol === '$') value = this.renderBlockVariable(token, context, partials, originalTemplate);
       else if (symbol === '&') value = this.unescapedValue(token, context);
       else if (symbol === 'name') value = this.escapedValue(token, context);
       else if (symbol === 'text') value = this.rawValue(token);
@@ -540,6 +581,34 @@
       return this.renderTokens(this.parse(value), context, partials, value);
   };
 
+  Writer.prototype.renderBlock = function renderBlock (token, context, partials, originalTemplate) {
+    if (!partials) return;
+
+    var value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
+    if (value != null)
+      // Ignore any wrongly set block vars before we started.
+      context.clearBlockVars();
+      // We are only rendering to record the default block variables.
+      this.renderTokens(token[4], context, partials, originalTemplate);
+      // Now we render and return the result.
+      var result = this.renderTokens(this.parse(value), context, partials, value);
+      // Don't leak the block variables outside this include.
+      context.clearBlockVars();
+      return result;
+  };
+
+  Writer.prototype.renderBlockVariable = function renderBlockVariable (token, context, partials, originalTemplate) {
+    var value = token[1];
+
+    var exists = context.getBlockVar(value);
+    if (!exists) {
+      context.setBlockVar(value, originalTemplate.slice(token[3], token[5]));
+      return this.renderTokens(token[4], context, partials, originalTemplate);
+    } else {
+      return this.renderTokens(this.parse(exists), context, partials, exists);
+    }
+  };
+
   Writer.prototype.unescapedValue = function unescapedValue (token, context) {
     var value = context.lookup(token[1]);
     if (value != null)
diff --git a/mustache.min.js b/mustache.min.js
index 29cdc1d57..f6862e15f 100644
--- a/mustache.min.js
+++ b/mustache.min.js
@@ -1 +1 @@
-(function defineMustache(global,factory){if(typeof exports==="object"&&exports){factory(exports)}else if(typeof define==="function"&&define.amd){define(["exports"],factory)}else{global.Mustache={};factory(Mustache)}})(this,function mustacheFactory(mustache){var objectToString=Object.prototype.toString;var isArray=Array.isArray||function isArrayPolyfill(object){return objectToString.call(object)==="[object Array]"};function isFunction(object){return typeof object==="function"}function escapeRegExp(string){return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}function hasProperty(obj,propName){return obj!=null&&typeof obj==="object"&&propName in obj}var regExpTest=RegExp.prototype.test;function testRegExp(re,string){return regExpTest.call(re,string)}var nonSpaceRe=/\S/;function isWhitespace(string){return!testRegExp(nonSpaceRe,string)}var entityMap={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;"};function escapeHtml(string){return String(string).replace(/[&<>"'\/]/g,function fromEntityMap(s){return entityMap[s]})}var whiteRe=/\s*/;var spaceRe=/\s+/;var equalsRe=/\s*=/;var curlyRe=/\s*\}/;var tagRe=/#|\^|\/|>|\{|&|=|!/;function parseTemplate(template,tags){if(!template)return[];var sections=[];var tokens=[];var spaces=[];var hasTag=false;var nonSpace=false;function stripSpace(){if(hasTag&&!nonSpace){while(spaces.length)delete tokens[spaces.pop()]}else{spaces=[]}hasTag=false;nonSpace=false}var openingTagRe,closingTagRe,closingCurlyRe;function compileTags(tagsToCompile){if(typeof tagsToCompile==="string")tagsToCompile=tagsToCompile.split(spaceRe,2);if(!isArray(tagsToCompile)||tagsToCompile.length!==2)throw new Error("Invalid tags: "+tagsToCompile);openingTagRe=new RegExp(escapeRegExp(tagsToCompile[0])+"\\s*");closingTagRe=new RegExp("\\s*"+escapeRegExp(tagsToCompile[1]));closingCurlyRe=new RegExp("\\s*"+escapeRegExp("}"+tagsToCompile[1]))}compileTags(tags||mustache.tags);var scanner=new Scanner(template);var start,type,value,chr,token,openSection;while(!scanner.eos()){start=scanner.pos;value=scanner.scanUntil(openingTagRe);if(value){for(var i=0,valueLength=value.length;i<valueLength;++i){chr=value.charAt(i);if(isWhitespace(chr)){spaces.push(tokens.length)}else{nonSpace=true}tokens.push(["text",chr,start,start+1]);start+=1;if(chr==="\n")stripSpace()}}if(!scanner.scan(openingTagRe))break;hasTag=true;type=scanner.scan(tagRe)||"name";scanner.scan(whiteRe);if(type==="="){value=scanner.scanUntil(equalsRe);scanner.scan(equalsRe);scanner.scanUntil(closingTagRe)}else if(type==="{"){value=scanner.scanUntil(closingCurlyRe);scanner.scan(curlyRe);scanner.scanUntil(closingTagRe);type="&"}else{value=scanner.scanUntil(closingTagRe)}if(!scanner.scan(closingTagRe))throw new Error("Unclosed tag at "+scanner.pos);token=[type,value,start,scanner.pos];tokens.push(token);if(type==="#"||type==="^"){sections.push(token)}else if(type==="/"){openSection=sections.pop();if(!openSection)throw new Error('Unopened section "'+value+'" at '+start);if(openSection[1]!==value)throw new Error('Unclosed section "'+openSection[1]+'" at '+start)}else if(type==="name"||type==="{"||type==="&"){nonSpace=true}else if(type==="="){compileTags(value)}}openSection=sections.pop();if(openSection)throw new Error('Unclosed section "'+openSection[1]+'" at '+scanner.pos);return nestTokens(squashTokens(tokens))}function squashTokens(tokens){var squashedTokens=[];var token,lastToken;for(var i=0,numTokens=tokens.length;i<numTokens;++i){token=tokens[i];if(token){if(token[0]==="text"&&lastToken&&lastToken[0]==="text"){lastToken[1]+=token[1];lastToken[3]=token[3]}else{squashedTokens.push(token);lastToken=token}}}return squashedTokens}function nestTokens(tokens){var nestedTokens=[];var collector=nestedTokens;var sections=[];var token,section;for(var i=0,numTokens=tokens.length;i<numTokens;++i){token=tokens[i];switch(token[0]){case"#":case"^":collector.push(token);sections.push(token);collector=token[4]=[];break;case"/":section=sections.pop();section[5]=token[2];collector=sections.length>0?sections[sections.length-1][4]:nestedTokens;break;default:collector.push(token)}}return nestedTokens}function Scanner(string){this.string=string;this.tail=string;this.pos=0}Scanner.prototype.eos=function eos(){return this.tail===""};Scanner.prototype.scan=function scan(re){var match=this.tail.match(re);if(!match||match.index!==0)return"";var string=match[0];this.tail=this.tail.substring(string.length);this.pos+=string.length;return string};Scanner.prototype.scanUntil=function scanUntil(re){var index=this.tail.search(re),match;switch(index){case-1:match=this.tail;this.tail="";break;case 0:match="";break;default:match=this.tail.substring(0,index);this.tail=this.tail.substring(index)}this.pos+=match.length;return match};function Context(view,parentContext){this.view=view;this.cache={".":this.view};this.parent=parentContext}Context.prototype.push=function push(view){return new Context(view,this)};Context.prototype.lookup=function lookup(name){var cache=this.cache;var value;if(cache.hasOwnProperty(name)){value=cache[name]}else{var context=this,names,index,lookupHit=false;while(context){if(name.indexOf(".")>0){value=context.view;names=name.split(".");index=0;while(value!=null&&index<names.length){if(index===names.length-1)lookupHit=hasProperty(value,names[index]);value=value[names[index++]]}}else{value=context.view[name];lookupHit=hasProperty(context.view,name)}if(lookupHit)break;context=context.parent}cache[name]=value}if(isFunction(value))value=value.call(this.view);return value};function Writer(){this.cache={}}Writer.prototype.clearCache=function clearCache(){this.cache={}};Writer.prototype.parse=function parse(template,tags){var cache=this.cache;var tokens=cache[template];if(tokens==null)tokens=cache[template]=parseTemplate(template,tags);return tokens};Writer.prototype.render=function render(template,view,partials){var tokens=this.parse(template);var context=view instanceof Context?view:new Context(view);return this.renderTokens(tokens,context,partials,template)};Writer.prototype.renderTokens=function renderTokens(tokens,context,partials,originalTemplate){var buffer="";var token,symbol,value;for(var i=0,numTokens=tokens.length;i<numTokens;++i){value=undefined;token=tokens[i];symbol=token[0];if(symbol==="#")value=this.renderSection(token,context,partials,originalTemplate);else if(symbol==="^")value=this.renderInverted(token,context,partials,originalTemplate);else if(symbol===">")value=this.renderPartial(token,context,partials,originalTemplate);else if(symbol==="&")value=this.unescapedValue(token,context);else if(symbol==="name")value=this.escapedValue(token,context);else if(symbol==="text")value=this.rawValue(token);if(value!==undefined)buffer+=value}return buffer};Writer.prototype.renderSection=function renderSection(token,context,partials,originalTemplate){var self=this;var buffer="";var value=context.lookup(token[1]);function subRender(template){return self.render(template,context,partials)}if(!value)return;if(isArray(value)){for(var j=0,valueLength=value.length;j<valueLength;++j){buffer+=this.renderTokens(token[4],context.push(value[j]),partials,originalTemplate)}}else if(typeof value==="object"||typeof value==="string"||typeof value==="number"){buffer+=this.renderTokens(token[4],context.push(value),partials,originalTemplate)}else if(isFunction(value)){if(typeof originalTemplate!=="string")throw new Error("Cannot use higher-order sections without the original template");value=value.call(context.view,originalTemplate.slice(token[3],token[5]),subRender);if(value!=null)buffer+=value}else{buffer+=this.renderTokens(token[4],context,partials,originalTemplate)}return buffer};Writer.prototype.renderInverted=function renderInverted(token,context,partials,originalTemplate){var value=context.lookup(token[1]);if(!value||isArray(value)&&value.length===0)return this.renderTokens(token[4],context,partials,originalTemplate)};Writer.prototype.renderPartial=function renderPartial(token,context,partials){if(!partials)return;var value=isFunction(partials)?partials(token[1]):partials[token[1]];if(value!=null)return this.renderTokens(this.parse(value),context,partials,value)};Writer.prototype.unescapedValue=function unescapedValue(token,context){var value=context.lookup(token[1]);if(value!=null)return value};Writer.prototype.escapedValue=function escapedValue(token,context){var value=context.lookup(token[1]);if(value!=null)return mustache.escape(value)};Writer.prototype.rawValue=function rawValue(token){return token[1]};mustache.name="mustache.js";mustache.version="2.1.2";mustache.tags=["{{","}}"];var defaultWriter=new Writer;mustache.clearCache=function clearCache(){return defaultWriter.clearCache()};mustache.parse=function parse(template,tags){return defaultWriter.parse(template,tags)};mustache.render=function render(template,view,partials){return defaultWriter.render(template,view,partials)};mustache.to_html=function to_html(template,view,partials,send){var result=mustache.render(template,view,partials);if(isFunction(send)){send(result)}else{return result}};mustache.escape=escapeHtml;mustache.Scanner=Scanner;mustache.Context=Context;mustache.Writer=Writer});
+(function defineMustache(global,factory){if(typeof exports==="object"&&exports){factory(exports)}else if(typeof define==="function"&&define.amd){define(["exports"],factory)}else{global.Mustache={};factory(Mustache)}})(this,function mustacheFactory(mustache){var objectToString=Object.prototype.toString;var isArray=Array.isArray||function isArrayPolyfill(object){return objectToString.call(object)==="[object Array]"};function isFunction(object){return typeof object==="function"}function escapeRegExp(string){return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}function hasProperty(obj,propName){return obj!=null&&typeof obj==="object"&&propName in obj}var regExpTest=RegExp.prototype.test;function testRegExp(re,string){return regExpTest.call(re,string)}var nonSpaceRe=/\S/;function isWhitespace(string){return!testRegExp(nonSpaceRe,string)}var entityMap={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;"};function escapeHtml(string){return String(string).replace(/[&<>"'\/]/g,function fromEntityMap(s){return entityMap[s]})}var whiteRe=/\s*/;var spaceRe=/\s+/;var equalsRe=/\s*=/;var curlyRe=/\s*\}/;var tagRe=/#|\^|\/|>|\{|&|=|!|\$|</;function parseTemplate(template,tags){if(!template)return[];var sections=[];var tokens=[];var spaces=[];var hasTag=false;var nonSpace=false;function stripSpace(){if(hasTag&&!nonSpace){while(spaces.length)delete tokens[spaces.pop()]}else{spaces=[]}hasTag=false;nonSpace=false}var openingTagRe,closingTagRe,closingCurlyRe;function compileTags(tagsToCompile){if(typeof tagsToCompile==="string")tagsToCompile=tagsToCompile.split(spaceRe,2);if(!isArray(tagsToCompile)||tagsToCompile.length!==2)throw new Error("Invalid tags: "+tagsToCompile);openingTagRe=new RegExp(escapeRegExp(tagsToCompile[0])+"\\s*");closingTagRe=new RegExp("\\s*"+escapeRegExp(tagsToCompile[1]));closingCurlyRe=new RegExp("\\s*"+escapeRegExp("}"+tagsToCompile[1]))}compileTags(tags||mustache.tags);var scanner=new Scanner(template);var start,type,value,chr,token,openSection;while(!scanner.eos()){start=scanner.pos;value=scanner.scanUntil(openingTagRe);if(value){for(var i=0,valueLength=value.length;i<valueLength;++i){chr=value.charAt(i);if(isWhitespace(chr)){spaces.push(tokens.length)}else{nonSpace=true}tokens.push(["text",chr,start,start+1]);start+=1;if(chr==="\n")stripSpace()}}if(!scanner.scan(openingTagRe))break;hasTag=true;type=scanner.scan(tagRe)||"name";scanner.scan(whiteRe);if(type==="="){value=scanner.scanUntil(equalsRe);scanner.scan(equalsRe);scanner.scanUntil(closingTagRe)}else if(type==="{"){value=scanner.scanUntil(closingCurlyRe);scanner.scan(curlyRe);scanner.scanUntil(closingTagRe);type="&"}else{value=scanner.scanUntil(closingTagRe)}if(!scanner.scan(closingTagRe))throw new Error("Unclosed tag at "+scanner.pos);token=[type,value,start,scanner.pos];tokens.push(token);if(type==="#"||type==="^"||type==="$"||type==="<"){sections.push(token)}else if(type==="/"){openSection=sections.pop();if(!openSection)throw new Error('Unopened section "'+value+'" at '+start);if(openSection[1]!==value)throw new Error('Unclosed section "'+openSection[1]+'" at '+start)}else if(type==="name"||type==="{"||type==="&"){nonSpace=true}else if(type==="="){compileTags(value)}}openSection=sections.pop();if(openSection)throw new Error('Unclosed section "'+openSection[1]+'" at '+scanner.pos);return nestTokens(squashTokens(tokens))}function squashTokens(tokens){var squashedTokens=[];var token,lastToken;for(var i=0,numTokens=tokens.length;i<numTokens;++i){token=tokens[i];if(token){if(token[0]==="text"&&lastToken&&lastToken[0]==="text"){lastToken[1]+=token[1];lastToken[3]=token[3]}else{squashedTokens.push(token);lastToken=token}}}return squashedTokens}function nestTokens(tokens){var nestedTokens=[];var collector=nestedTokens;var sections=[];var token,section;for(var i=0,numTokens=tokens.length;i<numTokens;++i){token=tokens[i];switch(token[0]){case"$":case"<":case"#":case"^":collector.push(token);sections.push(token);collector=token[4]=[];break;case"/":section=sections.pop();section[5]=token[2];collector=sections.length>0?sections[sections.length-1][4]:nestedTokens;break;default:collector.push(token)}}return nestedTokens}function Scanner(string){this.string=string;this.tail=string;this.pos=0}Scanner.prototype.eos=function eos(){return this.tail===""};Scanner.prototype.scan=function scan(re){var match=this.tail.match(re);if(!match||match.index!==0)return"";var string=match[0];this.tail=this.tail.substring(string.length);this.pos+=string.length;return string};Scanner.prototype.scanUntil=function scanUntil(re){var index=this.tail.search(re),match;switch(index){case-1:match=this.tail;this.tail="";break;case 0:match="";break;default:match=this.tail.substring(0,index);this.tail=this.tail.substring(index)}this.pos+=match.length;return match};function Context(view,parentContext){this.view=view;this.blocks={};this.cache={".":this.view};this.parent=parentContext}Context.prototype.push=function push(view){return new Context(view,this)};Context.prototype.setBlockVar=function set(name,value){var blocks=this.blocks;blocks[name]=value;return value};Context.prototype.clearBlockVars=function clearBlockVars(){this.blocks={}};Context.prototype.getBlockVar=function getBlockVar(name){var blocks=this.blocks;var value;if(blocks.hasOwnProperty(name)){value=blocks[name]}else{if(this.parent){value=this.parent.getBlockVar(name)}}return value};Context.prototype.lookup=function lookup(name){var cache=this.cache;var value;if(cache.hasOwnProperty(name)){value=cache[name]}else{var context=this,names,index,lookupHit=false;while(context){if(name.indexOf(".")>0){value=context.view;names=name.split(".");index=0;while(value!=null&&index<names.length){if(index===names.length-1)lookupHit=hasProperty(value,names[index]);value=value[names[index++]]}}else{value=context.view[name];lookupHit=hasProperty(context.view,name)}if(lookupHit)break;context=context.parent}cache[name]=value}if(isFunction(value))value=value.call(this.view);return value};function Writer(){this.cache={}}Writer.prototype.clearCache=function clearCache(){this.cache={}};Writer.prototype.parse=function parse(template,tags){var cache=this.cache;var tokens=cache[template];if(tokens==null)tokens=cache[template]=parseTemplate(template,tags);return tokens};Writer.prototype.render=function render(template,view,partials){var tokens=this.parse(template);var context=view instanceof Context?view:new Context(view);return this.renderTokens(tokens,context,partials,template)};Writer.prototype.renderTokens=function renderTokens(tokens,context,partials,originalTemplate){var buffer="";var token,symbol,value;for(var i=0,numTokens=tokens.length;i<numTokens;++i){value=undefined;token=tokens[i];symbol=token[0];if(symbol==="#")value=this.renderSection(token,context,partials,originalTemplate);else if(symbol==="^")value=this.renderInverted(token,context,partials,originalTemplate);else if(symbol===">")value=this.renderPartial(token,context,partials,originalTemplate);else if(symbol==="<")value=this.renderBlock(token,context,partials,originalTemplate);else if(symbol==="$")value=this.renderBlockVariable(token,context,partials,originalTemplate);else if(symbol==="&")value=this.unescapedValue(token,context);else if(symbol==="name")value=this.escapedValue(token,context);else if(symbol==="text")value=this.rawValue(token);if(value!==undefined)buffer+=value}return buffer};Writer.prototype.renderSection=function renderSection(token,context,partials,originalTemplate){var self=this;var buffer="";var value=context.lookup(token[1]);function subRender(template){return self.render(template,context,partials)}if(!value)return;if(isArray(value)){for(var j=0,valueLength=value.length;j<valueLength;++j){buffer+=this.renderTokens(token[4],context.push(value[j]),partials,originalTemplate)}}else if(typeof value==="object"||typeof value==="string"||typeof value==="number"){buffer+=this.renderTokens(token[4],context.push(value),partials,originalTemplate)}else if(isFunction(value)){if(typeof originalTemplate!=="string")throw new Error("Cannot use higher-order sections without the original template");value=value.call(context.view,originalTemplate.slice(token[3],token[5]),subRender);if(value!=null)buffer+=value}else{buffer+=this.renderTokens(token[4],context,partials,originalTemplate)}return buffer};Writer.prototype.renderInverted=function renderInverted(token,context,partials,originalTemplate){var value=context.lookup(token[1]);if(!value||isArray(value)&&value.length===0)return this.renderTokens(token[4],context,partials,originalTemplate)};Writer.prototype.renderPartial=function renderPartial(token,context,partials){if(!partials)return;var value=isFunction(partials)?partials(token[1]):partials[token[1]];if(value!=null)return this.renderTokens(this.parse(value),context,partials,value)};Writer.prototype.renderBlock=function renderBlock(token,context,partials,originalTemplate){if(!partials)return;var value=isFunction(partials)?partials(token[1]):partials[token[1]];if(value!=null)context.clearBlockVars();this.renderTokens(token[4],context,partials,originalTemplate);var result=this.renderTokens(this.parse(value),context,partials,value);context.clearBlockVars();return result};Writer.prototype.renderBlockVariable=function renderBlockVariable(token,context,partials,originalTemplate){var value=token[1];var exists=context.getBlockVar(value);if(!exists){context.setBlockVar(value,originalTemplate.slice(token[3],token[5]));return this.renderTokens(token[4],context,partials,originalTemplate)}else{return this.renderTokens(this.parse(exists),context,partials,exists)}};Writer.prototype.unescapedValue=function unescapedValue(token,context){var value=context.lookup(token[1]);if(value!=null)return value};Writer.prototype.escapedValue=function escapedValue(token,context){var value=context.lookup(token[1]);if(value!=null)return mustache.escape(value)};Writer.prototype.rawValue=function rawValue(token){return token[1]};mustache.name="mustache.js";mustache.version="2.1.2";mustache.tags=["{{","}}"];var defaultWriter=new Writer;mustache.clearCache=function clearCache(){return defaultWriter.clearCache()};mustache.parse=function parse(template,tags){return defaultWriter.parse(template,tags)};mustache.render=function render(template,view,partials){return defaultWriter.render(template,view,partials)};mustache.to_html=function to_html(template,view,partials,send){var result=mustache.render(template,view,partials);if(isFunction(send)){send(result)}else{return result}};mustache.escape=escapeHtml;mustache.Scanner=Scanner;mustache.Context=Context;mustache.Writer=Writer});
diff --git a/test/_files/inheritance_context_cleaned.js b/test/_files/inheritance_context_cleaned.js
new file mode 100644
index 000000000..ce598d2d3
--- /dev/null
+++ b/test/_files/inheritance_context_cleaned.js
@@ -0,0 +1 @@
+({ })
diff --git a/test/_files/inheritance_context_cleaned.mustache b/test/_files/inheritance_context_cleaned.mustache
new file mode 100644
index 000000000..953335838
--- /dev/null
+++ b/test/_files/inheritance_context_cleaned.mustache
@@ -0,0 +1 @@
+{{$section}}rendered{{/section}}|{{<partial}}{{$section}}inherited{{/section}}{{/partial}}|{{$section}}rendered{{/section}}
diff --git a/test/_files/inheritance_context_cleaned.partial b/test/_files/inheritance_context_cleaned.partial
new file mode 100644
index 000000000..747bac839
--- /dev/null
+++ b/test/_files/inheritance_context_cleaned.partial
@@ -0,0 +1 @@
+{{$section}}ignored{{/section}}
\ No newline at end of file
diff --git a/test/_files/inheritance_context_cleaned.txt b/test/_files/inheritance_context_cleaned.txt
new file mode 100644
index 000000000..5fb54ad2d
--- /dev/null
+++ b/test/_files/inheritance_context_cleaned.txt
@@ -0,0 +1 @@
+rendered|inherited|rendered
diff --git a/test/_files/inheritance_empty_list_section.js b/test/_files/inheritance_empty_list_section.js
new file mode 100644
index 000000000..553388e89
--- /dev/null
+++ b/test/_files/inheritance_empty_list_section.js
@@ -0,0 +1 @@
+({ "inheritable": [] })
diff --git a/test/_files/inheritance_empty_list_section.mustache b/test/_files/inheritance_empty_list_section.mustache
new file mode 100644
index 000000000..2847508ef
--- /dev/null
+++ b/test/_files/inheritance_empty_list_section.mustache
@@ -0,0 +1 @@
+<{{$inheritable}}rendered{{/inheritable}}>
diff --git a/test/_files/inheritance_empty_list_section.txt b/test/_files/inheritance_empty_list_section.txt
new file mode 100644
index 000000000..0d6086115
--- /dev/null
+++ b/test/_files/inheritance_empty_list_section.txt
@@ -0,0 +1 @@
+<rendered>
diff --git a/test/_files/inheritance_false_section.js b/test/_files/inheritance_false_section.js
new file mode 100644
index 000000000..31b244639
--- /dev/null
+++ b/test/_files/inheritance_false_section.js
@@ -0,0 +1 @@
+({ "inheritable": false })
diff --git a/test/_files/inheritance_false_section.mustache b/test/_files/inheritance_false_section.mustache
new file mode 100644
index 000000000..2847508ef
--- /dev/null
+++ b/test/_files/inheritance_false_section.mustache
@@ -0,0 +1 @@
+<{{$inheritable}}rendered{{/inheritable}}>
diff --git a/test/_files/inheritance_false_section.txt b/test/_files/inheritance_false_section.txt
new file mode 100644
index 000000000..0d6086115
--- /dev/null
+++ b/test/_files/inheritance_false_section.txt
@@ -0,0 +1 @@
+<rendered>
diff --git a/test/_files/inheritance_missing_section.js b/test/_files/inheritance_missing_section.js
new file mode 100644
index 000000000..ce598d2d3
--- /dev/null
+++ b/test/_files/inheritance_missing_section.js
@@ -0,0 +1 @@
+({ })
diff --git a/test/_files/inheritance_missing_section.mustache b/test/_files/inheritance_missing_section.mustache
new file mode 100644
index 000000000..dcf8f5633
--- /dev/null
+++ b/test/_files/inheritance_missing_section.mustache
@@ -0,0 +1 @@
+{{$inheritable}}rendered{{/inheritable}}
diff --git a/test/_files/inheritance_missing_section.txt b/test/_files/inheritance_missing_section.txt
new file mode 100644
index 000000000..e69bcfc51
--- /dev/null
+++ b/test/_files/inheritance_missing_section.txt
@@ -0,0 +1 @@
+rendered
diff --git a/test/_files/inheritance_no_new_context.js b/test/_files/inheritance_no_new_context.js
new file mode 100644
index 000000000..1125694dc
--- /dev/null
+++ b/test/_files/inheritance_no_new_context.js
@@ -0,0 +1 @@
+({ "subject": "rendered", "inheritable": { "subject": "ignored" } })
diff --git a/test/_files/inheritance_no_new_context.mustache b/test/_files/inheritance_no_new_context.mustache
new file mode 100644
index 000000000..297983294
--- /dev/null
+++ b/test/_files/inheritance_no_new_context.mustache
@@ -0,0 +1 @@
+<{{$inheritable}}{{subject}}{{/inheritable}}>
diff --git a/test/_files/inheritance_no_new_context.txt b/test/_files/inheritance_no_new_context.txt
new file mode 100644
index 000000000..0d6086115
--- /dev/null
+++ b/test/_files/inheritance_no_new_context.txt
@@ -0,0 +1 @@
+<rendered>
diff --git a/test/_files/inheritance_only_once.js b/test/_files/inheritance_only_once.js
new file mode 100644
index 000000000..90a6ac86f
--- /dev/null
+++ b/test/_files/inheritance_only_once.js
@@ -0,0 +1 @@
+({ "inheritable": [0,1,2,3] })
diff --git a/test/_files/inheritance_only_once.mustache b/test/_files/inheritance_only_once.mustache
new file mode 100644
index 000000000..2847508ef
--- /dev/null
+++ b/test/_files/inheritance_only_once.mustache
@@ -0,0 +1 @@
+<{{$inheritable}}rendered{{/inheritable}}>
diff --git a/test/_files/inheritance_only_once.txt b/test/_files/inheritance_only_once.txt
new file mode 100644
index 000000000..0d6086115
--- /dev/null
+++ b/test/_files/inheritance_only_once.txt
@@ -0,0 +1 @@
+<rendered>
diff --git a/test/_files/inheritance_partials_can_embed.js b/test/_files/inheritance_partials_can_embed.js
new file mode 100644
index 000000000..ce598d2d3
--- /dev/null
+++ b/test/_files/inheritance_partials_can_embed.js
@@ -0,0 +1 @@
+({ })
diff --git a/test/_files/inheritance_partials_can_embed.mustache b/test/_files/inheritance_partials_can_embed.mustache
new file mode 100644
index 000000000..fcc6bfa35
--- /dev/null
+++ b/test/_files/inheritance_partials_can_embed.mustache
@@ -0,0 +1 @@
+before {{<partial}}ignored{{/partial}} after
diff --git a/test/_files/inheritance_partials_can_embed.partial b/test/_files/inheritance_partials_can_embed.partial
new file mode 100644
index 000000000..5fcb85206
--- /dev/null
+++ b/test/_files/inheritance_partials_can_embed.partial
@@ -0,0 +1 @@
+partial
\ No newline at end of file
diff --git a/test/_files/inheritance_partials_can_embed.txt b/test/_files/inheritance_partials_can_embed.txt
new file mode 100644
index 000000000..991d5127f
--- /dev/null
+++ b/test/_files/inheritance_partials_can_embed.txt
@@ -0,0 +1 @@
+before partial after
diff --git a/test/_files/inheritance_partials_can_embed_section.js b/test/_files/inheritance_partials_can_embed_section.js
new file mode 100644
index 000000000..20594a7d3
--- /dev/null
+++ b/test/_files/inheritance_partials_can_embed_section.js
@@ -0,0 +1 @@
+({ "items": [0,1,2,3] })
diff --git a/test/_files/inheritance_partials_can_embed_section.mustache b/test/_files/inheritance_partials_can_embed_section.mustache
new file mode 100644
index 000000000..50bcd1bff
--- /dev/null
+++ b/test/_files/inheritance_partials_can_embed_section.mustache
@@ -0,0 +1 @@
+{{#items}}{{<partial}}ignored{{/partial}}{{/items}}
diff --git a/test/_files/inheritance_partials_can_embed_section.partial b/test/_files/inheritance_partials_can_embed_section.partial
new file mode 100644
index 000000000..91012a681
--- /dev/null
+++ b/test/_files/inheritance_partials_can_embed_section.partial
@@ -0,0 +1 @@
+{{.}}
\ No newline at end of file
diff --git a/test/_files/inheritance_partials_can_embed_section.txt b/test/_files/inheritance_partials_can_embed_section.txt
new file mode 100644
index 000000000..40381e26f
--- /dev/null
+++ b/test/_files/inheritance_partials_can_embed_section.txt
@@ -0,0 +1 @@
+0123
diff --git a/test/_files/inheritance_partials_can_override.js b/test/_files/inheritance_partials_can_override.js
new file mode 100644
index 000000000..ce598d2d3
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override.js
@@ -0,0 +1 @@
+({ })
diff --git a/test/_files/inheritance_partials_can_override.mustache b/test/_files/inheritance_partials_can_override.mustache
new file mode 100644
index 000000000..0cc57f273
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override.mustache
@@ -0,0 +1 @@
+{{<partial}}{{$inheritable}}inherited{{/inheritable}}{{/partial}}
diff --git a/test/_files/inheritance_partials_can_override.partial b/test/_files/inheritance_partials_can_override.partial
new file mode 100644
index 000000000..c0652d24d
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override.partial
@@ -0,0 +1 @@
+{{$inheritable}}ignored{{/inheritable}}
\ No newline at end of file
diff --git a/test/_files/inheritance_partials_can_override.txt b/test/_files/inheritance_partials_can_override.txt
new file mode 100644
index 000000000..9152fd11e
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override.txt
@@ -0,0 +1 @@
+inherited
diff --git a/test/_files/inheritance_partials_can_override_duplicated.js b/test/_files/inheritance_partials_can_override_duplicated.js
new file mode 100644
index 000000000..ce598d2d3
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_duplicated.js
@@ -0,0 +1 @@
+({ })
diff --git a/test/_files/inheritance_partials_can_override_duplicated.mustache b/test/_files/inheritance_partials_can_override_duplicated.mustache
new file mode 100644
index 000000000..0cc57f273
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_duplicated.mustache
@@ -0,0 +1 @@
+{{<partial}}{{$inheritable}}inherited{{/inheritable}}{{/partial}}
diff --git a/test/_files/inheritance_partials_can_override_duplicated.partial b/test/_files/inheritance_partials_can_override_duplicated.partial
new file mode 100644
index 000000000..2825d7d78
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_duplicated.partial
@@ -0,0 +1 @@
+{{$inheritable}}ignored{{/inheritable}} {{$inheritable}}ignored{{/inheritable}}
\ No newline at end of file
diff --git a/test/_files/inheritance_partials_can_override_duplicated.txt b/test/_files/inheritance_partials_can_override_duplicated.txt
new file mode 100644
index 000000000..469691ccf
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_duplicated.txt
@@ -0,0 +1 @@
+inherited inherited
diff --git a/test/_files/inheritance_partials_can_override_nested_section.js b/test/_files/inheritance_partials_can_override_nested_section.js
new file mode 100644
index 000000000..20594a7d3
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_nested_section.js
@@ -0,0 +1 @@
+({ "items": [0,1,2,3] })
diff --git a/test/_files/inheritance_partials_can_override_nested_section.mustache b/test/_files/inheritance_partials_can_override_nested_section.mustache
new file mode 100644
index 000000000..ecdd8599e
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_nested_section.mustache
@@ -0,0 +1 @@
+{{<partial}}{{$inheritable}}{{.}}{{/inheritable}}{{/partial}}
diff --git a/test/_files/inheritance_partials_can_override_nested_section.partial b/test/_files/inheritance_partials_can_override_nested_section.partial
new file mode 100644
index 000000000..96eea7446
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_nested_section.partial
@@ -0,0 +1 @@
+{{#items}}{{$inheritable}}ignored{{/inheritable}}{{/items}}
\ No newline at end of file
diff --git a/test/_files/inheritance_partials_can_override_nested_section.txt b/test/_files/inheritance_partials_can_override_nested_section.txt
new file mode 100644
index 000000000..40381e26f
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_nested_section.txt
@@ -0,0 +1 @@
+0123
diff --git a/test/_files/inheritance_partials_can_override_recursive.js b/test/_files/inheritance_partials_can_override_recursive.js
new file mode 100644
index 000000000..5e771c3d0
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_recursive.js
@@ -0,0 +1 @@
+({ "content": "X", "nodes": [ { "content": "Y", "nodes": [] } ] })
diff --git a/test/_files/inheritance_partials_can_override_recursive.mustache b/test/_files/inheritance_partials_can_override_recursive.mustache
new file mode 100644
index 000000000..f10902a93
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_recursive.mustache
@@ -0,0 +1 @@
+<{{<partial}}{{/partial}}>
diff --git a/test/_files/inheritance_partials_can_override_recursive.partial b/test/_files/inheritance_partials_can_override_recursive.partial
new file mode 100644
index 000000000..40f826154
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_recursive.partial
@@ -0,0 +1 @@
+{{content}}<{{#nodes}}{{>partial}}{{/nodes}}>
\ No newline at end of file
diff --git a/test/_files/inheritance_partials_can_override_recursive.txt b/test/_files/inheritance_partials_can_override_recursive.txt
new file mode 100644
index 000000000..d84e94fe5
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_recursive.txt
@@ -0,0 +1 @@
+<X<Y<>>>
diff --git a/test/_files/inheritance_partials_can_override_recursive_section.js b/test/_files/inheritance_partials_can_override_recursive_section.js
new file mode 100644
index 000000000..5e771c3d0
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_recursive_section.js
@@ -0,0 +1 @@
+({ "content": "X", "nodes": [ { "content": "Y", "nodes": [] } ] })
diff --git a/test/_files/inheritance_partials_can_override_recursive_section.mustache b/test/_files/inheritance_partials_can_override_recursive_section.mustache
new file mode 100644
index 000000000..f83e0eef1
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_recursive_section.mustache
@@ -0,0 +1 @@
+<{{<partial}}{{$value}}{{>partial}}{{/value}}{{/partial}}>
diff --git a/test/_files/inheritance_partials_can_override_recursive_section.partial b/test/_files/inheritance_partials_can_override_recursive_section.partial
new file mode 100644
index 000000000..c741b3675
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_recursive_section.partial
@@ -0,0 +1 @@
+{{content}}<{{#nodes}}{{$value}}overriden{{/value}}{{/nodes}}>
\ No newline at end of file
diff --git a/test/_files/inheritance_partials_can_override_recursive_section.txt b/test/_files/inheritance_partials_can_override_recursive_section.txt
new file mode 100644
index 000000000..d84e94fe5
--- /dev/null
+++ b/test/_files/inheritance_partials_can_override_recursive_section.txt
@@ -0,0 +1 @@
+<X<Y<>>>
diff --git a/test/_files/inheritance_partials_cannot_overide.js b/test/_files/inheritance_partials_cannot_overide.js
new file mode 100644
index 000000000..bc31ba589
--- /dev/null
+++ b/test/_files/inheritance_partials_cannot_overide.js
@@ -0,0 +1 @@
+({ "section": true })
diff --git a/test/_files/inheritance_partials_cannot_overide.mustache b/test/_files/inheritance_partials_cannot_overide.mustache
new file mode 100644
index 000000000..69dd160a1
--- /dev/null
+++ b/test/_files/inheritance_partials_cannot_overide.mustache
@@ -0,0 +1 @@
+{{<partial}}{{$section}}inherited{{/section}}{{/partial}}
diff --git a/test/_files/inheritance_partials_cannot_overide.partial b/test/_files/inheritance_partials_cannot_overide.partial
new file mode 100644
index 000000000..1bf8e120e
--- /dev/null
+++ b/test/_files/inheritance_partials_cannot_overide.partial
@@ -0,0 +1 @@
+{{#section}}success{{/section}}
\ No newline at end of file
diff --git a/test/_files/inheritance_partials_cannot_overide.txt b/test/_files/inheritance_partials_cannot_overide.txt
new file mode 100644
index 000000000..2e9ba477f
--- /dev/null
+++ b/test/_files/inheritance_partials_cannot_overide.txt
@@ -0,0 +1 @@
+success