The mmap branch was slightly incompatible with the develop branch --
fix up the merge.