Document properties
Merge pull request #4149 from timvandermeij/document-properties

Document properties