Merge pull request #13216 from neheb/lmdb