Merge pull request #1870 from saper/langinfo_h