Merge branch 'master' of github.com:go-yaml/yaml