CDB-3609
Merge pull request #633 from CartoDB/CDB-3609

CDB-3609