CDB-3856

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