Merge pull request #5313 from lambdageek/corefx-sre-fixup