template work for #733, handle geoserver down
Merge branch 'master' into integration