Backport new Grunt config from Upstream