main
Merge the rest of the trunk.
Update Python Folder.icns icon file to match new macOS look (GH-1780)