Manually merging in pull request from sesuncedu.