Merge pull request #4962 from totten/master-angular-ts