Fix malformed paths

(thanks to @OndrejMarsalek)
Merge branch 'v2.0' into v2.1
Merge branch 'v2.1' into v2.1-hrex