bugfix: project relative uri encoding
Merge branch 'master' into ribbons
Merge remote-tracking branch 'origin/ribbons' into ribbons