Merge pull request #3747 from splitbrain/issue3746