Merge pull request #4950 from Memphiz/osxfixoptical