Merge upstream 3.0.0-wip
Changed Grunt task name from bootstrap to dist