CDB-3238
Merge branch 'master' into CDB-3238
CDB-3238
Merge pull request #542 from CartoDB/CDB-3238

Tested at staging