Merge branch 'master' into default-route

Conflicts:
	package/yast2-network.changes