Merge pull request #1261 from jwillemsen/jwi-cle