Merge "support strikethrough markup tag" into devel/master