Issue #2296775 by gauravkhambhala | jhodgdon: Fixed Content Markers defgroup/topic mentions theme_mark() (nonexistent).
Issue #1792836 by damiankloip, alansaviolobo, Kars-T | tim.plunkett: Merge HandlerBase::breakPhrase() and HandlerBase::breakPhraseString() and clean up.