CDB-4021
Merge pull request #738 from CartoDB/CDB-4021

CDB-4021