Cdb 3980

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