Merge branch 'master' into tdb

Conflicts:
	lib/handlebars/compiler/ast.js