Merge branch 'master' of ssh://git@localhost/cl7