Fix incorrect environment variable names in Grunt task.
Merge branch 'master' into geezer
[ci skip]