Update grunt packages, minor fixes
Merge origin/master