Merge otland/forgottenserver so I could get 10.21 support.