Improve grunt config and vars
Merge pull request #12295 from ZDroid/types

Improve grunt config and vars