Merge remote-tracking branch 'upstream/master' - leftovers take 2