CDB-2769
Merge pull request #776 from CartoDB/CDB-2769

CDB-2769