Disable grunt
Merge branch 'master' into production

Removes Grunt