Import 3.14.1-2 changes
Merge 3.14.2-1 changes

Conflicts:
	PKGBUILD