Merge "Fix use of yaml.load()"