Merge branch 'master' into tommy

Conflicts:
	lib/handlebars/compiler/ast.js
	lib/handlebars/compiler/base.js