Merge branch 'master' into saml_based_federated_single_sign_on
OC-1075: message 'This authenticated method is not supported', should be shown when need it.
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired