CDB-4010

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