Merge pull request #12802 from pgavlin/VSO462269
authorPat Gavlin <pgavlin@gmail.com>
Wed, 9 Aug 2017 18:25:29 +0000 (11:25 -0700)
committerGitHub <noreply@github.com>
Wed, 9 Aug 2017 18:25:29 +0000 (11:25 -0700)
Fix VSO 462269.


Trivial merge