Merge branch 'pa/auto-gc-mac-osx' into maint