Change 3016

Barrie Slaymaker
Request Review
and fix test suite breakage due to last change
1 edited 0 added 0 deleted
Tip: Use n and p to cycle through the changes.