Merge branch 'links' into 'gnome-3-34'

Clean up composer link insertion and deletion

Closes #591 (closed)

See merge request !326 (merged)

(cherry picked from commit c2019cab)

52d010bb Clean up composer link insertion and deletion