Merge branch 'master' into merge-master

Conflicts:
	taglib/toolkit/tbytevector.cpp