Merge branch 'fix-crash-on-bad-LANG_STANDARD' into release