Merge pull request #2210 from jwillemsen/jwi-noaceroot