Merge pull request #15756 from briansull/fix-15671
authorBrian Sullivan <briansul@microsoft.com>
Sat, 6 Jan 2018 04:17:25 +0000 (20:17 -0800)
committerGitHub <noreply@github.com>
Sat, 6 Jan 2018 04:17:25 +0000 (20:17 -0800)
Fix for 15671


Trivial merge