2.8.3.6 hotfix

This only affects mainline, but the other packs have had a version bump to indicate they're still in-date and fixed.