Merge branch 'ss/compat-default-source-for-newer-gnu'