bug-1302: double link removed
Merge branch 'bug-1302' into testserver-stable