Merge pull request #23817 from wtgodbe/LateMerge
authorWilliam Godbe <wigodbe@microsoft.com>
Tue, 9 Apr 2019 01:02:41 +0000 (18:02 -0700)
committerGitHub <noreply@github.com>
Tue, 9 Apr 2019 01:02:41 +0000 (18:02 -0700)
Catch-up recent changes in Master into release/3.0


Trivial merge