CDB-3857
Merge pull request #690 from CartoDB/CDB-3857

CDB-3857