Merge branch 'geni-v3' of http://git.onelab.eu/sfa into geni-v3