added tpl
remove endings
Merge remote-tracking branch 'upstream/master'
changed
Merge remote-tracking branch 'upstream/master'