Follow upstream Octopress

Corresponding commit or issues:
- https://github.com/imathis/octopress/commit/514ed5eb9f6bb91a6f3288febf3c2ba892a9b693
- https://github.com/imathis/octopress/pull/1699