Update to RDoc master b96b689

@drbrain I created backport patch for rdoc master. It have large diffs :octocat: 

Can I commit this?