Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pacman/Pacman/bin/x86/Pacman.7z