Merge branch 'pf-document-extensions'

Reviewed-by: Richard Maw