Editor: Better description-text for links
Merge branch 'master' into demo