Merge "Remove stray newline from err() call." into main