Merge branch 'master' of ITER Git repository