Merge latest commits from mojombo/jekyll