clear timeout when template is destroyed
Merge branch 'master' into packaging