CDB-2777
Merge pull request #436 from CartoDB/CDB-2777

CDB-2777