Merge remote-tracking branch 'upstream/master'

Conflicts:
	sci-electronics/libsigrokdecode/libsigrokdecode-9999.ebuild