Merge "Fix some @params documentation in includes/{GlobalFunctions,User.php}"