Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	pacman-extra.conf
#	pacman-gnome-unstable.conf
#	pacman-kde-unstable.conf
#	pacman-multilib-staging.conf
#	pacman-multilib-testing.conf
#	pacman-staging.conf