Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	Makefile
#	arch-nspawn.in
#	archrelease.in
#	archrm.in
#	bash_completion.in
#	commitpkg.in
#	crossrepomove.in
#	lib/valid-tags.sh
#	rebuildpkgs.in