CDB-3625
Merge branch 'CDB-3625' of https://github.com/CartoDB/cartodb into CDB-3625