Merging in a feature from PECOS petsc.m4