Merge pull request #7654 from yashodha/contributors-update