CDB-4365
Merge pull request #871 from CartoDB/CDB-4365

CDB-4365
Merge branch 'master' of https://github.com/CartoDB/cartodb