Updated to latest changes from the TFS repo.