issue 571

https://github.com/Jasig/cas/issues/571
Merge branch 'gh-pages' of github.com:Jasig/cas into gh-pages