simplified security policy
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/security.policy