CDB-3900

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