Merge branch 'master' of ssh://schlaile@git.misdn.org/var/git/lcr