Merge master to taglib2

I'd like to hear about whether this does fix the errors on OS X.