Merge branch 'master' into tlv-mic

diff --git a/shibboleth/resolver b/shibboleth/resolver
index c3a25d9..24967b2 160000 (submodule)
--- a/shibboleth/resolver
+++ b/shibboleth/resolver
@@ -1 +1 @@
-Subproject commit c3a25d938cfc8b171aca717437d743908f378084
+Subproject commit 24967b25cc7d6573d3ab76d0d8a1f02d93c6b106

diff --git a/shibboleth/sp b/shibboleth/sp
index 8e9c50d..28fcbaa 160000 (submodule)
--- a/shibboleth/sp
+++ b/shibboleth/sp
@@ -1 +1 @@
-Subproject commit 8e9c50db98f6c0bbf58ec714786b8207de75d55d
+Subproject commit 28fcbaa4e8c5090550a3e0ceaf0ea6a1355b890b