Merge "Extending Style - Adding Strikethrough" into devel/master