Merge branch 'pr/11779' into drop_recess_for_less

Conflicts:
	Gruntfile.js
	package.json

diff --cc Gruntfile.js
index 35ad76394ba511670c54b65ec1c9a5ae6cc10a53,c7277cb987126650f75a53b0ecee31c7bdd481ff..36112c840496c8c55bf0bc3452b65a36a100fa49
--- 1/Gruntfile.js
--- 2/Gruntfile.js
+++ b/Gruntfile.js
@@@ -322,9 -307,8 +329,10 @@@ module.exports = function (grunt) 
    grunt.loadNpmTasks('grunt-contrib-concat');
    grunt.loadNpmTasks('grunt-contrib-connect');
    grunt.loadNpmTasks('grunt-contrib-copy');
+   grunt.loadNpmTasks('grunt-contrib-csslint');
 +  grunt.loadNpmTasks('grunt-contrib-cssmin');
    grunt.loadNpmTasks('grunt-contrib-jshint');
 +  grunt.loadNpmTasks('grunt-contrib-less');
    grunt.loadNpmTasks('grunt-contrib-qunit');
    grunt.loadNpmTasks('grunt-contrib-uglify');
    grunt.loadNpmTasks('grunt-contrib-watch');

diff --cc package.json
index 0d414000f3519daa6ca343fda9ca81f01c155768,e6adbc17e4c79efe04f36d5f451cdf51b4d6518f..5cd7c90ec6499b999838f3374076193b7d8603ab
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -27,9 -26,8 +27,10 @@@
      , "grunt-contrib-concat": "~0.3.0"
      , "grunt-contrib-connect": "~0.5.0"
      , "grunt-contrib-copy": "~0.4.1"
+     , "grunt-contrib-csslint": "~0.2.0"
 +    , "grunt-contrib-cssmin": "~0.7.0"
      , "grunt-contrib-jshint": "~0.7.0"
 +    , "grunt-contrib-less": "~0.8.0"
      , "grunt-contrib-qunit": "~0.3.0"
      , "grunt-contrib-uglify": "~0.2.4"
      , "grunt-contrib-watch": "~0.5.3"