Merge remote-tracking branch 'bparsons/master'

Conflicts:
	PKGBUILD