CDB-4081
Merge pull request #767 from CartoDB/CDB-4081

CDB-4081