Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
2018-04-12 17:14:18 +02:00