Merge "Fix changelog generation on some systems" into r