CDB-3527

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