Merge remote-tracking branch 'github/master'
fix of an issue with log creation
Merge branch 'master' into devel