Update the pysaml required version
Fallback for non users in context
Merge branch 'master' into saml2_logout

Conflicts:
	setup.py