Merge "Canonicalise '@deprecated since' doc comments"