CDB-3853

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