CDB-4089

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