Merge pull request #1386 from DavidKorczynski/cifuzz