CDB-2769

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