Merging commits from upstream Octopress development