Merges from trunk.
Merge from trunk.
Fuzzing infrastructure fix.
Merge fuzzing branch.
Fix ChangeLog