Merge branch 'onelab' of git://git.onelab.eu/myslice into onelab