updated to upstream v3.0.3
Merge branch 'upstream' at v3.0.3