*** Merge remote-tracking branch 'origin/mdb.master' into 2.4-merge.mdb
*** Merge remote-tracking branch 'uio/mdb/fixes' into 2.4-merge.mdb