CDB-1738
Merge pull request #787 from CartoDB/CDB-1738

CDB-1738