fixes for --
Merge branch 'rel-095' of https://github.com/eXpansionPluginPack/eXpansion into rel-095