cherry pick 34b6c3e9eb2795537f9154e1f733cb8dddb59c98
Merge branch 'master' of https://github.com/tastemade/Yaml