Merge "Update tagsoup to 1.2.1"