Squashed 'osx/updater/' content from commit a558402

git-subtree-dir: osx/updater
git-subtree-split: a5584021435fc74a1e5da447524b37dcf7311bbc
Merge commit '8934a11dbffce6b0611d97d5748668a5cdb8ba8a' as 'osx/updater'
Switch to subtree
Merge branch 'pr939'