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

Already tested & live
Merge branch 'master' into CDB-2891

Conflicts:
	app/models/permission.rb