Merge remote-tracking branch 'origin/manfred' into roland - This contains async logging stuff. There are still some TODOs for proper shutdown
picked fabians "extended message text provider implementation"
Merge remote-tracking branch 'origin/development' into alex
Merge remote-tracking branch 'origin/alex' into manfred