Merge branch 'thgeneric' of ssh://git.onelab.eu/git/sfa into thgeneric