Merge remote-tracking branch 'upstream/master', again.