Merge branch 'attribute-descriptions' into 'master'

Attribute descriptions

See merge request !60
3 jobs for master in 37 seconds (queued for 1 second)