Fix make install
Merge branch 'master' into per_context_registry_196