Merge remote-tracking branch 'remotes/upstream/master' into sockeye