CDB-4020
Merge pull request #734 from CartoDB/CDB-4020

CDB-4020