Merge branch 'master' into arch

Conflicts:
	runcoms/zpreztorc