Merge pull request #19870 from totten/master-psr0