CDB-3857

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