Fix collision
Merge branch 'master' of github.com:james-henderson/multiplay