Metadata fix for rdoc->md conversion
Merge branch 'develop'