Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Replace link to Workspace set-up with new one (#5896)
  Fixes making paths of linked files relative (web urls will not be touched anymore) (#5879)