CDB-3211

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