backport 22fb909 to 3.3

Backport 22fb909 (epscript fixes from @MrkGrgsn) to 3.3, for inclusion in next 3.3._x_ release.