Merge pull request #3670 from martin-frbg/osxvermin