Merge branch 'fix-grunt-test'