Backport revision 4926 of PJProject.