Merge branch 'tz/c-locale-output-is-no-more'