Merge branch 'master' of ssh://mercury/var/git/irwi