Probable fix for http://mail.kde.org/pipermail/taglib-devel/2013-July/002516.html
Merge remote-tracking branch 'Rachus/taglib2' into taglib2