Merge branch 'master' into lmdb
fix for mapsize setting
Merge branch 'lmdb' into epdimport