Merge remote-tracking branch 'origin/master' into new2-release-1.0.x