Merged master into taglib2

Merged a lot of commits.