Merge branch 'master' of D:\Herby\eranet\eranet\oauth2-for-apis\passport-saml with conflicts.