fix global Template leak.
Merge branch 'hotfix/0.5.1'
Merge tag '0.5.1' into develop