Merge branch 'f26' of https://simlab.ww.uni-erlangen.de/ww8it/module-environment into f26