Merge pull request #3870 from jow-/pen-update