Added description fields so the displayname can be used for e.g. buttons and links.
Merge remote-tracking branch 'upstream/master'