grunt refactorings (build is expected to break due to vulnerable dependencies)
Merge remote-tracking branch 'origin/master'