Discard all changes from release-1.9 and keep only master, this is just to get the 1.9.7 tag into our history.
Wade Simmons