Doof magoof
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7.x