merged with gisweb-master