Merge remote-tracking branch 'upstream/blead' into blead