Merge pull request #3012 from Davidy22/gdscript