Merge pull request #4780 in master
fix typo : "StdClass" should "stdClass" with little "s"
Merge pull request #4826
Merge pull request #4826 in develop