Merge branch 'master' into merge-master-to-taglib2

Conflicts:
	taglib/ogg/opus/opusproperties.cpp