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