CDB-3709

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