CDB-3609

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