Merge pull request #7734 from yashodha/4.7-version-fix