Merge branch 'master' into develop
Make point and linestring layers also selectable
Merge branch 'develop'