Updating to the latest changes from the TFS repo