Merge branch 'master' of git@taebak:slp/pkgs/e/ecore