ccefc6e697
Includes a fix to a brittle test that failed due to changes in the number of linebreaks.
Includes a fix to a brittle test that failed due to changes in the number of linebreaks.