Merge branch 'master' into decorations-api

Conflicts:
	lib/linter-view.coffee