Merge with upstream - updated libmagic.patch