Merge branch 'master' into d2