CDB-1755
CDB-1755
Merge pull request #778 from CartoDB/CDB-1755

CDB-1755