CDB-4103

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