Temporarily disable wait/xml protocol...
Merge remote-tracking branch 'origin/PHP-5.6'
Ignore commit 113f1fd6d5eb286c50f6cca003d18f847bc202cb when merging