Merge remote-tracking branch 'octopress/master'