Screw core.
Merge remote-tracking branch 'origin/yaml' into yaml