Merge pull request #2165 from splitbrain/alt2164