Add @timeoutTemplateString support
Merge branch 'master' of https://github.com/cordjs/core