Merge branch 'master' into trailingTrivia2

Conflicts:
	src/services/compiler/precompile.ts
Merge branch 'trailingTrivia2' of https://github.com/CyrusNajmabadi/TypeScript into trailingTrivia2