Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws