Merge pull request #6887 from illume/upstream-dmg-license-0037-b99dfd26