CDB-3761

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