fixing rdoc task
Merge branch 'master' into fix-rdoc