Merge branch 'rc' into 'master'

SCRUM#637: Prevents zenity from running as root.

See merge request !15
4 jobs for master in 2 minutes and 45 seconds (queued for 3 seconds)