CDB-3852

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