merge from upstream repo to get tests for additional new macros.  keep the curl hack.
merge from upstream repo to get tests for additional new macros.  keep the curl hack.

kongr45gpen/bzflag-import-1,kongr45gpen/bzflag-import-1,kongr45gpen/bzflag-import-1,kongr45gpen/bzflag-import-1,kongr45gpen/bzflag-import-1,kongr45gpen/bzflag-import-1