Update TypeScript Definitions
Merge branch 'master' into dev