Merge remote-tracking branch 'upstream/master'

Conflicts:
	taglib/riff/wav/wavfile.cpp
	taglib/toolkit/tbytevector.h