CDB-4028
Merge pull request #741 from CartoDB/CDB-4028

CDB-4028