forked version for applying hotfixes when I'm running my server. most patches will be merged to upstream. do not use this