Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS