template.escape now handles non-string values correctly.
Merge remote-tracking branch 'origin/master'