Cdb 3695

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