Merge from master
https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server