Code

Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint