CDB-2837 Merged Luisico changes
Merge pull request #413 from CartoDB/CDB-2837

CDB-2837 Merged Luisico changes