diverses
Bugfix 1.11.18
Merge branch 'bugfix' into develop