Merge grunt into master