upstream/1.0_rc4-2
fe4a8970 · Merge branch 'upstream' into upstream-clean ·