Merge branch '3.16'
Merge remote-tracking branch 'aur/master'

Conflicts:
	PKGBUILD
	config
	config.x86_64