Merge branch 'master' into stable

dockerfiles/Dockerfile.nginx

@@ -76,6 +76,8 @@ RUN /tmp/shibboleth_sp_with_fastcgi.sh
 # copy the init script
 RUN cp /opt/shibboleth-sp-fastcgi/etc/shibboleth/shibd-debian /etc/init.d/shibd
 RUN chmod a+x /etc/init.d/shibd
+# add IdP metadata from CLARIN server
+ADD https://infra.clarin.eu/aai/prod_md_about_spf_idps.xml /opt/shibboleth-sp-fastcgi/var/cache/shibboleth/ 
 
 # create the test secure folder and set up perl fastcgi
 RUN mkdir /opt/nginx/html/secure