commit b660491d3f (mdb_txn_id()) plus c36c167cc4 (fix prev commit) from mdb.master.
b660491d3f
c36c167cc4