Merge pull request #2129 from jwillemsen/jwi-qnx