sync with codeplex(27618)