Merge pull request #7068 from neheb/jool