linkchecker's fixes.
Merge branch 'devel'
Rebuilt after merge.