Changes I can't Remember Making that I had Locally#88

brianwyka wants to merge 2 commits intomainOptum/sourcehawk:mainfrom

more-fixesOptum/sourcehawk:more-fixesCopy head branch name to clipboard