CDB-3133

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