Merge remote-tracking branch 'refs/remotes/overtone/master' into magit-ediff-bug