- Sync'ed with CodePlex repositories (r108024)