Merge branch '3960_remove_mmap'