CDB-4048
Merge pull request #742 from CartoDB/CDB-4048

CDB-4048
Merge branch 'master' into CDB-3620