[trunk] Import git commit 99a6f1af177c15f4db475186b79d169c993494ef from ghostscript...