Merge in changes to github-0.8 and fix so it would compile.