Merge #8169: OSX diskimages need 0775 folder permissions