Merge pull request #4441 from Memphiz/osxdevicereset