Disambiguate dummy symbols#107

encounter merged 3 commits intoencounter:mainencounter/objdiff:mainfrom

OndrikB:mainOndrikB/objdiff:mainCopy head branch name to clipboard