Merge branch 'master' into non-affine-sweep