Merge 'remotes/origin/master' into v2.0