Merge pull request #238 from Rochet2/Rel20

Temporarily fix crash on shutdown
Eluna: Fix merge conflicts, Fix possible crash on startup, Update version hash