Paul van Brenk 3df79d5238 Merge branch 'master' into pvb/codeaction/api
# Conflicts:
#	src/compiler/diagnosticMessages.json
#	src/services/services.ts
2016-09-16 14:09:58 -07:00
..