Merge master to taglib2

Merged the commits for the last two months.