fix Rd
Merge branch 'trunk'