fix last merge from -ais, allowing grouped vector layers
Merge branch 'labs' into norgeskart