CDB-3301
Merge pull request #560 from CartoDB/CDB-3301

Already tested & live