Merge pull request #2025 from vkeranov/develop

Some minor changes to Xmlrpc.php and Xmlrpcs.php