Merge branch 'master' of ssh://git.code.sf.net/p/cman/code