Merge pull request #6909 from illume/upstream-0043-linux-executable-name