Merging latest changes from Jasig/cas to local repo