Work around libintl's vprintf macro messing with OutputFile::vprintf
Merge branch 'elieux-master'