merge in netbase changes
use new sdl2