Merge branch 'master' into luke-421-linux-dock-icon

1 job for 445
latest