Merge pull request #12379 from totten/master-psr16-sqlgroup