Update history to reflect merge of #3091 [ci skip]
Merge branch 'master' of github.com:jekyll/jekyll

* 'master' of github.com:jekyll/jekyll:
  Get rid of noifniof
Update history to reflect merge of #3094 [ci skip]