Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2