Merge pull request #2433 from splitbrain/issue2399