Merge branch 'master' into tbaut-fix-window-size

1 job for pr-436 in 1 minute and 6 seconds (queued for 1 second)