grunt on last merge

BS3 commits: a2aaf80c7e9f1848926e2c8817ee8475c8b30b43