Conflict resolve
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixes database lock exceptions

Thus fixing characters not loading their data correctly from the
database after server-restart.
Merge pull request #1222 from CharonInferar/DatabaseLockFix

Fixes database lock exceptions