Pull in the latest updates from the p4h module.

This incorporates changes precipitated by what the instructor learned!