CDB-3211 Security patch (kudos to Andrew Fink)
Merge pull request #531 from CartoDB/CDB-3211

CDB-3211