CDB-3775

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