Merge origin/Grive2 into Grive2

Conflicts:
	package/arch/PKGBUILD