CDB-4061

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