bring en par with upstream
gpslibs now included (was submodule)