Allow embedding .addin files into submodule assemblies
Merge branch 'sm-with-config'