Merge "Fix param docs and passed type of UserMailer::sendWithPear"