merge from upstream
Merge branch 'master' into 3.0