Recent merge with Octopress master was corrupt. Hand-merged by diffing with Markerbench, which was known to be up-to-date.