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