Merge pull request #2321 from jwillemsen/jwi-PATCHversion