Merge remote-tracking branch 'remote/master'

Conflicts:
	scpaste.el