Merge pull request #15475 from briansull/issue-15412
authorBrian Sullivan <briansul@microsoft.com>
Wed, 13 Dec 2017 01:54:31 +0000 (17:54 -0800)
committerGitHub <noreply@github.com>
Wed, 13 Dec 2017 01:54:31 +0000 (17:54 -0800)
Fix for issue 15412


Trivial merge