Merge master into TagLib2