* Cherry-pick took the wrong lines for a couple of things. * Update and commit dependencies after `grunt bower`