Merge branch 'upstream' into 2.0alpha