Merge pull request #11304 from pgavlin/GH11273
authorPat Gavlin <pgavlin@gmail.com>
Mon, 1 May 2017 19:31:25 +0000 (12:31 -0700)
committerGitHub <noreply@github.com>
Mon, 1 May 2017 19:31:25 +0000 (12:31 -0700)
Fix #11273 by adjusting the fix for VSO 406163.


Trivial merge