Import 3.13.8 changes
Merge upstream changes

Conflicts:
	PKGBUILD