Merged master into taglib2.