r962
Merge branch 'master' of github.com:benapetr/huggle