Merged with latest Octopress version.