Added extra error handling code for the shibboleth delegator - previously, any errors would just cause the user logging in to fall back through to the login screen, and not log any issues.
Merge remote-tracking branch 'refs/remotes/origin/hotfix/delegator' into private/maintenance