Merge pull request #597 from minad/plan9