I'm going to leave p5-* alone for now (where the version stuff is going to land is still unclear).
PR: 6517 Submitted by: Steven G. Kargl <kargl@troutmask.apl.washington.edu>