CDB-3835

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