Merge branch 'documentation' into 'master'

Improve javadoc for ExtraInfoDescriptor classes.

See merge request !4
1 job for master in 2 minutes and 35 seconds (queued for 3 seconds)