rebase master on top of the latest closure changes

Hello @nicks, 

The diff list is too damn high!

- [ ] The Server JS has been reviewed

R=@nicks