Merge branch 'master' into merge-master

Conflicts:
	AUTHORS
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tfilestream.cpp
	tests/test_id3v2.cpp