Merge branch 'master' of github.com:Thibolt/intra-stage2.1