nil parsed in yaml is just a string, should be explicit
Merge pull request #2536 from letuboy/master
Update history to reflect merge of #2536 [ci skip]