Updated cartodb.js
Merge branch 'release/2.11.1' of github.com:CartoDB/cartodb into release/2.11.1