Merge branch 'resored_relative_path' into 'master'

Added relative path again

See merge request !31
15 jobs for master in 24 minutes and 14 seconds (queued for 3 seconds)