Areloch Merge pull request #2240 from GarageGames/Release_3_10_1