Update Changes from blead commit 3c3ba04e4dd6
Correct POD error from upstream fixes