Changed mirror to hs-fulda
Merge branch 'upstream-master'
solved conflicts