CDB-4103
Merge pull request #775 from CartoDB/CDB-4103

CDB-4103