Merge pull request #3151 from akoeplinger/fix-islocal