Adds rdoc support.
Merges upstream with local