CDB-3900
Merge pull request #713 from CartoDB/CDB-3900

CDB-3900