Merge "Extending Text Styles - Adding Dashed/Double Underline" into devel/master