rich text
rich text
Merge remote-tracking branch 'origin'

"rich text"
fix path
Merge remote-tracking branch 'troubadoour/master'