Merge branch 'hotfix/build-artifacts'
Wrapping grunt template data in function to allow late evaluation.
Merge branch 'master' into develop