Merge branch 'master' into mark/use-codeinspection

Conflicts:
	linterReporter.js