Merge branch 'master' of git-server:slp/pkgs/e/elementary