Summary of changes:
55c68ab... New upstream release (*)
c6f1ca1... New upstream release (*)
dfb9b12... Update to git snapshot (*)
4d4498d... Revert "Fix filename join (rfbz#6080)" (*)
fd63f12... Merge branch 'master' into f35 (*)
(*) This commit already existed in another branch; no separate mail sent