Merged tlf.1.in from upstream