CDB-4010
Merge pull request #733 from CartoDB/CDB-4010

CDB-4010