CDB-4081

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