Merge branch 'master' into funcDeclsInBlocks

Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/parser.ts
Merge branch 'master' into funcDeclsInBlocks
Merge branch 'master' into funcDeclsInBlocks
Merge branch 'funcDeclsInBlocks' into sourceFileUpdate

Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/utilities.ts