Merge branch...

Merge branch '20-logs-are-not-kept-when-a-file-with-the-same-name-as-the-logs-folder-name-exists' into 'master'

Resolve "Logs are not kept when a file with the same name as the logs folder name exists"

See merge request !16
17 jobs for master in 11 minutes and 13 seconds (queued for 5 seconds)