rich text
richtext
rich text
Merge remote-tracking branch 'troubadoour/master' into test
fix merge