CDB-4048

https://cartodb.atlassian.net/browse/CDB-4048