merge https://github.com/mojombo/jekyll/pull/1245