CDB-3838 detecting
Merge pull request #678 from CartoDB/CDB-3838

CDB-3838