Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
German translation updated.
Merge pull request #1585 from Phylon/patch-4

Updated German translation