Merge branch 'js/ignore-space-at-eol' into maint