Merge remote-tracking branch 'origin/master' into debian

Conflicts:
	firefox
	moonshot/libeap
	moonshot/mech_eap/util_saml.cpp
	moonshot/mech_eap/util_shib.cpp
	openssh
	shibboleth/opensaml2
	shibboleth/resolver
	shibboleth/sp
	shibboleth/xmltooling

diff --cc moonshot/libeap
index c1dbc6c,2ad5208..a7cc967
--- 1/moonshot/libeap
--- 2/moonshot/libeap
+++ b/moonshot/libeap
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit c1dbc6ce3fba2c256573821035d0d43883886f44
 -Subproject commit 2ad5208de2f097b0072efe44fc71615f1cee4e2d
++Subproject commit a7cc9675085b48b8933a96c32bd1e772e1c7a565

diff --cc shibboleth/resolver
index d1d1507,e1448b2..2c57c43
--- 1/shibboleth/resolver
--- 2/shibboleth/resolver
+++ b/shibboleth/resolver
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit d1d1507d8cdc2b6abfe4972f5aed4ba256095fcc
 -Subproject commit e1448b2d4c30435dc69124cfb7b6371275910355
++Subproject commit 2c57c433b4b96c94c0291d6b5e4d534cea5b6fe1

diff --cc shibboleth/sp
index 529f204,52e973a..4ba3bb3
--- 1/shibboleth/sp
--- 2/shibboleth/sp
+++ b/shibboleth/sp
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 529f204c395cd7753c1fee83d0968a3979932aac
 -Subproject commit 52e973ac041e2fc3ae3131b1099d435dce6a730d
++Subproject commit 4ba3bb35229e77e0662dc17e82b24cb2a6106c17