Merge branch 'master' into luke-refactor-menu-and-no-close-minimise-window-for-taskbar-app

1 job for pr-440 in 1 minute and 32 seconds (queued for 2 seconds)