Merge branch 'master' of slp-scm.sec.samsung.net:slp/pkgs/e/elementary