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