Merge branch 'master' of git://git.code.sf.net/p/openpli/openpli-oe-core