Updated Grunt plugins, ran test: passed.
Merge branch 'develop'