Added trim t file parameter to allow spaces in {( file.html )} syntax.
Merge remote-tracking branch 'origin/master'