Merge from CodePlex