#23: Grunt build fix.
Merge remote-tracking branch 'origin/master' into 19