Restore extraction of accessors
Merge branch 'master' into skos_expansion