CDB-3868

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