Merge branch 'jc/ignore-cr-at-eol'