Apply missed changes of imathis/octopress