CDB-3919
Merge pull request #716 from CartoDB/CDB-3919

CDB-3919