Merge remote-tracking branch 'origin/master'

Conflicts:
	kernel.spec
Merge remote-tracking branch 'zoklp1/master'