Merge "Follow rename of tagsouplib to tagsoup"