merge upstream phpxmlrpc