Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
	app/models/organization_destroyer.rb