Merge master into lmdb branch