Merge master to taglib2