quiet byte-compiler
Merge branch 'maint'

Conflicts:
	magit.el