magit-mode-setup: fix scope issue when evaluating buffer form
Merge branch 'master' into next

Conflicts:
	magit.el