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