Merge pull request #2840 from pyhalov/berkeleydb