enhancements in the doc.meta language
Merge remote-tracking branch 'origin/master'