trim errant `\r` line feed so variables match
Merge branch 'refs/heads/patch-1' into develop