Merge YACYAML upstream commits