Merge branch 'master' into taglib2

Conflicts:
	taglib/ogg/opus/opusfile.cpp
	taglib/riff/wav/wavfile.cpp
	taglib/toolkit/tstring.h
Fix broken merge
Added support for RIFF MP3 format