Merge pull request #1 from ktomk/pear-patch-2

Fix Pear Bugs #19315 & #19176