Merge "Resolve cases for strikethrough when using multiple <s> tags" into devel/master