Change 1352

Request Review
Integrates
    Change 350 by grant_glouser
    Change 352 by grant_glouser

Resolved -ay, since the changes were already present in Jam
2.3 from other sources. (This change is for the benefit of the
integration history, only.)
6 edited 0 added 0 deleted
Tip: Use n and p to cycle through the changes.