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

Conflicts:
	.gitmodules
	shibboleth/opensaml2
	shibboleth/sp
	shibboleth/xmltooling
	source_packages

diff --cc openssh
index 0000000,5d21250..a984024
mode 000000,160000..160000
--- /dev/null
--- 2/openssh
+++ b/openssh
@@@ -1,0 -1,1 +1,1 @@@
 -Subproject commit 5d212506d4ccc7f0e93dbfc756f380583addb20e
++Subproject commit a9840243f209dbf3ff39182e981b41842c727be0

diff --cc shibboleth/sp
index a500125,8e9c50d..f20d53a
--- 1/shibboleth/sp
--- 2/shibboleth/sp
+++ b/shibboleth/sp
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a500125b87f94e4f08b4fc1e4b403a6469220666
 -Subproject commit 8e9c50db98f6c0bbf58ec714786b8207de75d55d
++Subproject commit f20d53a572a09fa901175b2d90869641da24a4b2

diff --cc source_packages
index a3df708,8a841bd..9670b3f
--- 1/source_packages
--- 2/source_packages
+++ b/source_packages
@@@ -4,3 -4,9 +4,4 @@@
  shibboleth/xmltooling
  shibboleth/opensaml2
  shibboleth/sp
 -libradsec/lib
 -libeap
 -jansson
 -mech_eap
 -#cyrus-sasl
+ shibboleth/resolver