CDB-3721

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