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