fix Rd warning
Merge branch 'trunk'
fix Rd warning
Merge branch 'trunk'