Merge branch 'master' of ssh://pwan.org/var/www/git/projects/hgr