Merged with current Octopress version