Merge master into branch and add Small fixes for Grunt.js build system