development/gambas3: Synced with upstream