Merge pull request #5327 from marek-safar/corefx-bump