Merge pull request #4695 from Memphiz/badaccess