Merge branch 'master' of git://midnight-commander.org/git/mc