Merge branch 'master' into features/csslint

Conflicts:
	test/unit/pre-commit/cli_test.rb