Merge branch 'develop' of https://github.com/Person8880/Shine into develop
Merge branch 'develop' of https://github.com/Person8880/Shine into develop
Should have been fixed, but ...

engine fix got "eaten" by build mashine
Merge pull request #376 from GhoulofGSG9/develop

This should have been fixed with 267