Latest changes from grunt

Run grunt.