cherry-pick from shigeya/jekyll@6658a2f