Merge pull request #2286 from sjpadgett/eligibility-update