Merge "fix issue when strikethrough used without ending tag" into devel/master