Merge pull request #6589 from briansull/issue-5954
authorBrian Sullivan <briansul@microsoft.com>
Thu, 4 Aug 2016 01:40:15 +0000 (18:40 -0700)
committerGitHub <noreply@github.com>
Thu, 4 Aug 2016 01:40:15 +0000 (18:40 -0700)
Fix for Issue 5954


Trivial merge