Sync Sharness with Git

Merge upstream changes.