CDB-3870

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