Merge "ApiHelp: Fix PHP notice when "wrap" parameter is provided"