Merge branch 'master' of git://git.onelab.eu/sface