Merge branch 'master' into xgi-0-0-2