Fixed grunt for version 0.4.
Merge branch 'v2.2.0' into update-theme