Merge branch 'hotfix/2.5.1'
Merge branch 'release/2.6.0'
Merge branch 'master' of github.com:smarden1/mustache.php into dev
starting triple braces without ending triple braces throws an error - previously this was swallowing an additional character