merge - filepush: Don't use mmap (17-11-2011)