Deal with case where first_name and last_name are delegated to other classes
Merge branch 'master' of github.com:ASCTech/shibboleth-rails