applied Daniel's patch to bring rawdisk support to the branch