Manually merge otland/forgottenserver to
49f3934f34ff1f5d8318899e857aff6bfff02097.