nightly update
Merge branch 'master' of ssh://github.com/mataddy/hockey