Merge branch 'master' of git.linuxmce.org:linuxmce/linuxmce

1 job for master in 51 seconds (queued for 15 seconds)