Change 18619

Russell C. Jackson (Rusty)
Updating main with current changes.
14 edited 3 added 3 deleted
Tip: Use n and p to cycle through the changes.