Disabled 'friendly collisions'
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh