Merge pull request #1532 from GarageGames/pr/1143