CDB-3785

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