CDB-2891 Branch stabilization
Merge branch 'CDB-2891' of https://github.com/CartoDB/cartodb into CDB-2891