Merge pull request #6035 from briansull/fix-5642
authorBrian Sullivan <briansul@microsoft.com>
Tue, 28 Jun 2016 22:51:05 +0000 (15:51 -0700)
committerGitHub <noreply@github.com>
Tue, 28 Jun 2016 22:51:05 +0000 (15:51 -0700)
Fix issue #5642


Trivial merge